Added right search panel on Compilations page.Modified title block.

This commit is contained in:
Svetlana Rastegina 2021-03-04 17:33:29 +01:00
parent 899b2e6d17
commit b620a439ba
8 changed files with 320 additions and 12 deletions

View file

@ -2498,6 +2498,24 @@ ul.dropdown ul.sub_menu li a:hover {
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: space-between; justify-content: space-between;
} }
.display.loggedIn >div#articleWrapper {
width: 80%;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: row-reverse;
flex-wrap: nowrap;
justify-content: space-between;
}
.display >div#articleWrapper {
width: 80%;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: row-reverse;
flex-wrap: nowrap;
justify-content: space-between;
}
.individual.loggedIn >div#articleWrapper >div#searchRightpanel { .individual.loggedIn >div#articleWrapper >div#searchRightpanel {
width: 27%; width: 27%;
margin-left: 3%; margin-left: 3%;
@ -2506,6 +2524,10 @@ ul.dropdown ul.sub_menu li a:hover {
width: 30%; width: 30%;
margin-left: 3%; margin-left: 3%;
} }
.display > div#articleWrapper > div#searchRightpanel {
width: 30%;
margin-left: 3%;
}
.individual.loggedIn >div#articleWrapper >div#wrapper-content { .individual.loggedIn >div#articleWrapper >div#wrapper-content {
width: 70%; width: 70%;
} }
@ -2791,6 +2813,12 @@ span.iconControlsNotEditable {
.individual.loggedIn >div#articleWrapper { .individual.loggedIn >div#articleWrapper {
width: 90%; width: 90%;
} }
.display.loggedIn >div#articleWrapper {
width: 90%;
}
.display >div#articleWrapper {
width: 90%;
}
} }
@media screen and (max-width: 1300px) { @media screen and (max-width: 1300px) {
@ -2827,6 +2855,12 @@ span.iconControlsNotEditable {
.individual.loggedIn >div#articleWrapper { .individual.loggedIn >div#articleWrapper {
width: 95%; width: 95%;
} }
.display.loggedIn >div#articleWrapper {
width: 95%;
}
.display >div#articleWrapper {
width: 95%;
}
} }
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {

View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0 (4035a4f, 2020-05-01)"
height="30.000002"
width="30"
sodipodi:docname="exportPdf.svg"
version="1.1"
viewBox="0 0 30 30.000002"
id="Layer_1"
data-name="Layer 1">
<metadata
id="metadata19">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:current-layer="Layer_1"
inkscape:window-maximized="1"
inkscape:window-y="24"
inkscape:window-x="0"
inkscape:cy="20.288771"
inkscape:cx="13.261527"
inkscape:zoom="9.2807765"
showgrid="false"
id="namedview17"
inkscape:window-height="994"
inkscape:window-width="1920"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
bordercolor="#666666"
pagecolor="#ffffff" />
<defs
id="defs4">
<style
id="style2">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
<style
id="style879">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-2{fill:#078cd6;}</style>
</defs>
<rect
y="0"
x="0"
height="30.000002"
width="30"
id="rect844"
style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.31713;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
style="fill:#8b4513;fill-opacity:1;fill-rule:evenodd;stroke:#8b4513;stroke-width:0.477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 19.029941,11.978389 v -2.8599261 0 L 13.31009,2.4453032 H 2.8263273 c -1.054445,0 -1.90924435,0.8563933 -1.90924435,1.9136048 v 21.912121 c 0,1.056855 0.84932735,1.913605 1.90416325,1.913605 H 17.125783 c 1.051643,0 1.904158,-0.856273 1.904158,-1.897842 V 24.3714 h 7.619952 c 1.583093,0 2.866446,-1.279592 2.866446,-2.858769 v -6.675474 c 0,-1.578854 -1.27361,-2.858768 -2.866446,-2.858768 z M 18.076632,24.3714 v 1.91291 c 0,0.522844 -0.426786,0.947015 -0.95327,0.947015 H 2.8236581 c -0.5197915,0 -0.9532704,-0.424871 -0.9532704,-0.948977 V 4.3475893 c 0,-0.5149715 0.4249277,-0.9489776 0.9490949,-0.9489776 h 9.5372984 v 4.7609001 c 0,1.0670992 0.852735,1.9122592 1.904634,1.9122592 h 3.815217 v 1.906618 h -7.619938 c -1.5830923,0 -2.8664553,1.279592 -2.8664553,2.858768 v 6.675474 c 0,1.578855 1.2736202,2.858769 2.8664553,2.858769 z M 13.31009,3.875266 v 4.2815136 c 0,0.5311235 0.429618,0.9616833 0.9502,0.9616833 h 3.530312 z m -2.865102,9.056432 c -1.0501363,0 -1.9014408,0.858145 -1.9014408,1.899006 v 6.68838 c 0,1.048793 0.860218,1.899007 1.9014408,1.899007 H 26.6616 c 1.050136,0 1.901431,-0.858145 1.901431,-1.899007 v -6.68838 c 0,-1.048793 -0.860209,-1.899006 -1.901431,-1.899006 z M 22.84318,17.69824 v -1.906617 h 3.813234 v -0.953308 h -4.766543 v 6.673159 h 0.953309 v -2.859925 h 2.859925 V 17.69824 Z M 10.450164,16.744932 v 4.766542 h 0.953309 v -2.859925 h 1.901965 c 1.05557,0 1.911269,-0.846281 1.911269,-1.906617 0,-1.052996 -0.852163,-1.906617 -1.911269,-1.906617 h -2.855274 z m 0.953309,-0.953309 v 1.906617 h 1.907618 c 0.52595,0 0.952307,-0.42314 0.952307,-0.953308 0,-0.526498 -0.421991,-0.953309 -0.952307,-0.953309 z m 4.766542,-0.953308 v 6.673159 h 2.855274 c 1.05557,0 1.911274,-0.84516 1.911274,-1.91226 v -2.84864 c 0,-1.056111 -0.852168,-1.912259 -1.911274,-1.912259 z m 0.953309,0.953308 v 4.766543 h 1.907618 c 0.52595,0 0.952307,-0.423 0.952307,-0.953126 v -2.860292 c 0,-0.526396 -0.421991,-0.953125 -0.952307,-0.953125 z"
id="document-file-pdf" />
</svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
data-name="Layer 1"
id="Layer_1"
viewBox="0 0 30 30.000002"
version="1.1"
sodipodi:docname="print.svg"
width="30"
height="30.000002"
inkscape:version="1.0 (4035a4f, 2020-05-01)">
<metadata
id="metadata19">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:document-rotation="0"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="994"
id="namedview17"
showgrid="false"
inkscape:zoom="13.125"
inkscape:cx="13.261527"
inkscape:cy="20.288771"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<defs
id="defs4">
<style
id="style2">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
<style
id="style879">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-2{fill:#078cd6;}</style>
</defs>
<rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.31713;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect844"
width="30"
height="30.000002"
x="0"
y="0" />
<g
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(0.55488528,0,0,0.55488528,-2.769864,-3.2226527)"
id="g909">
<path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1"
d="M 16,46 H 11 A 4,4 0 0 1 7,42 V 24 a 4,4 0 0 1 4,-4 h 42 a 4,4 0 0 1 4,4 v 18 a 4,4 0 0 1 -4,4 h -5"
id="path885" />
<line
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1"
x1="15"
x2="49"
y1="41"
y2="41"
id="line887" />
<path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1"
d="m 20,41 h 24 v 12 a 2,2 0 0 1 -2,2 H 22 a 2,2 0 0 1 -2,-2 z"
id="path889" />
<circle
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-2"
cx="45.5"
cy="29.5"
r="2"
id="circle891" />
<path
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1"
d="m 39,10 v 4 a 2,2 0 0 0 2,2 h 4.06 L 39.77,10 H 21 a 2,2 0 0 0 -2,2 v 7"
id="path893" />
<line
style="fill:none;fill-opacity:1;stroke:#8b4513;stroke-width:2.16260918;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
class="cls-1"
x1="26"
x2="38"
y1="45"
y2="45"
id="line895" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
data-name="Layer 1"
id="Layer_1"
viewBox="0 0 30 30.000002"
version="1.1"
sodipodi:docname="save.svg"
width="30"
height="30.000002"
inkscape:version="1.0 (4035a4f, 2020-05-01)">
<metadata
id="metadata19">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:document-rotation="0"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="994"
id="namedview17"
showgrid="false"
inkscape:zoom="13.125"
inkscape:cx="13.261527"
inkscape:cy="20.288771"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<defs
id="defs4">
<style
id="style2">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
<style
id="style879">.cls-1{fill:none;stroke:#078cd6;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-2{fill:#078cd6;}</style>
</defs>
<g
id="g859"
transform="matrix(1.2842715,0,0,1.2842715,-4.8150373,-3.5364063)"
style="stroke:#8b4513;stroke-width:0.93438187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
<path
style="stroke:#8b4513;stroke-width:0.93438187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8"
d="M 20.768612,24.539185 H 7.3302333 A 1.7917839,1.7917839 0 0 1 5.5384493,22.747401 V 6.6213458 a 1.7917839,1.7917839 0 0 1 1.791784,-1.791784 H 23.456288 a 1.7917839,1.7917839 0 0 1 1.791784,1.791784 V 20.059725 Z"
class="cls-1" />
<rect
style="stroke:#8b4513;stroke-width:0.93438187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect10"
y="4.8295612"
x="9.5699596"
width="11.646596"
height="11.198649"
class="cls-1" />
<rect
style="stroke:#8b4513;stroke-width:0.93438187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect12"
y="21.403564"
x="11.80969"
width="7.1671357"
height="3.1356218"
class="cls-1" />
<line
style="stroke:#8b4513;stroke-width:0.93438187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="line14"
y2="24.539188"
y1="21.403564"
x2="17.185043"
x1="17.185043"
class="cls-1" />
</g>
<rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:1.31713;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect844"
width="30"
height="30.000002"
x="0"
y="0" />
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

View file

@ -33,6 +33,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
<section id="individual-info" ${infoClass!} role="region" style="width: 100%;"> <section id="individual-info" ${infoClass!} role="region" style="width: 100%;">
<#include "individual-adminPanel.ftl"> <#include "individual-adminPanel.ftl">
<header> <header>
<div id="articleTitleWrapper">
<#if relatedSubject??> <#if relatedSubject??>
<h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n().for} ${relatedSubject.name}</h2> <h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n().for} ${relatedSubject.name}</h2>
<p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p> <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>
@ -67,19 +68,20 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
<@p.mostSpecificTypesPerson individual editable/> <@p.mostSpecificTypesPerson individual editable/>
</#if> </#if>
</#if> </#if>
</div>
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#if>> <span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#if>>
<#include "individual-iconControls.ftl"> <#include "individual-iconControls-iph.ftl">
</span> </span>
<#if editable && profilePageTypesEnabled > <#if editable && profilePageTypesEnabled >
<#include "individual-profilePageTypes.ftl"> <#include "individual-profilePageTypes.ftl">
</#if> </#if>
<@expandSwitch />
</header> </header>
<!-- Positions --> <!-- Positions -->
<#include "individual-positions.ftl"> <#include "individual-positions.ftl">
<!-- Overview --> <!-- Overview -->
<#if !editable> <#if !editable>
<p></p>
</#if> </#if>
<#include "individual-overview.ftl"> <#include "individual-overview.ftl">
@ -120,8 +122,6 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
</#if> </#if>
<@expandSwitch />
<div id="TOC"></div> <div id="TOC"></div>
<#assign firstPub = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#firstPublication")!> <#assign firstPub = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#firstPublication")!>
<#if firstPub.statements?has_content && firstPub.type == "data"> <#if firstPub.statements?has_content && firstPub.type == "data">

View file

@ -63,7 +63,7 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
</#if> </#if>
</#if> </#if>
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#if>> <span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess>style="top:5px"</#if>>
<#include "individual-iconControls.ftl"> <#include "individual-iconControls-iph.ftl">
</span> </span>
<#if editable && profilePageTypesEnabled > <#if editable && profilePageTypesEnabled >
<#include "individual-profilePageTypes.ftl"> <#include "individual-profilePageTypes.ftl">
@ -74,7 +74,6 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
<!-- Overview --> <!-- Overview -->
<#if !editable> <#if !editable>
<p></p>
</#if> </#if>
<#include "individual-overview.ftl"> <#include "individual-overview.ftl">

View file

@ -13,8 +13,8 @@
<#include "menu.ftl"> <#include "menu.ftl">
<div id="articleWrapper"> <div id="articleWrapper">
<#if currentServlet = "individual" && currentServlet != "display"> <#if currentServlet = "individual"||currentServlet = "display">
<#include "rightPanel.ftl" > <#include "rightPanel.ftl">
</#if> </#if>
<#include "contentWrapper.ftl"> <#include "contentWrapper.ftl">
<#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "customsearch"> <#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "customsearch">

View file

@ -1,8 +1,8 @@
<div id="searchRightpanel"> <div id="searchRightpanel">
<div id="articleIconsWrapper"> <div id="articleIconsWrapper">
<button id="print"><img src="${urls.base}/themes/iph/images/print-icon.png"></button> <button id="print"><img src="${urls.base}/themes/iph/images/print.svg"></button>
<button id="save"><img src="${urls.base}/themes/iph/images/save-icon.png"></button> <button id="save"><img src="${urls.base}/themes/iph/images/save.svg"></button>
<button id="exportPdf"><img src="${urls.base}/themes/iph/images/save-pdf-icon.png"></button> <button id="exportPdf"><img src="${urls.base}/themes/iph/images/exportPdf.svg"></button>
</div> </div>
<#include "customsearchpanel.ftl" > <#include "customsearchpanel.ftl" >
</div> </div>