litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modified authors affilation style.

Browse source
This commit is contained in:
Svetlana Rastegina 2021-03-22 22:49:52 +01:00 • committed by Georgy Litvinov
parent 06062a82e3
commit 9debab83c1
2 changed files with 53 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
webapp/src/main/webapp/themes/iph/css/iph.css
View file

@ -2388,7 +2388,7 @@ button.collapsible {
font-family: "IPH Astra Serif";
font-size: 1.4rem !important;
cursor: pointer;
padding: 18px;
padding: 14px;
width: 100%;
text-align: left;
border: none;
@ -2525,7 +2525,6 @@ button.collapsible.metadataRubrics.active {
font-family: IPH Astra Serif;
font-style: italic;
font-size: 1.2rem;
margin-top: 10px;
}
.virtualArticleWorks >div.virtualWorks >div.work {
background-image: url(../images/bullet_icon.png);
@ -2969,7 +2968,7 @@ span.iconControlsEditable {
border-bottom: 1px dashed #9C9C9C;
}
.collapsible.collapsed {
padding: 18px 18px 18px 10px;
padding: 8px 8px 8px 10px;
}
.collapsible.collapsed >div.collapsibleLink {
background-image: url(../images/arrow-down-big.svg);
@ -2982,8 +2981,7 @@ span.iconControlsEditable {
font-weight: normal;
}
.collapsible.expanded {
padding: 18px 18px 18px 10px;
border-bottom: 1px solid #dde4e3;
padding: 8px 8px 8px 10px;
}
.collapsible.expanded >div.collapsibleLink {
background-image: url(../images/arrow-top-big.svg);
@ -3092,6 +3090,34 @@ label.switch >#collapseTextControl >img {
font-family: "IPH Astra Serif";
font-size: 1.2rem;
}
.affilation {
margin-bottom: 10px;
}
.expandedAuthors >.affilation {
font-family: "IPH Astra Serif";
line-height: 1.6em;
}
.expandedAuthors >.affilation >b {
font-family: "IPH Astra Serif";
font-size: 1.2rem;
padding: 5px;
border-bottom: 1px solid #dde4e3;
border-top: 1px solid #dde4e3;
display: block;
font-weight: normal;
margin-bottom: 8px;
background-color: #F6F6F6;
}
.authorOrgName {
font-family: "IPH Astra Serif";
font-size: 1.1rem;
color: #4F4F4F;
}
.authorOrgAdress {
font-family: "IPH Astra Serif";
font-size: 1.1rem;
color: #4F4F4F;
}
/* -------------------------------------------------> */
/* FONTS --------------------------------> */
/* -------------------------------------------------> */

44
webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
View file

@ -117,14 +117,14 @@
<#assign buttonText = "No text" >
</#if>
<#list 1..count as x>
<button type="button" style="border:none;padding: 18px;width: 100%; text-align:left;" class="collapsible">${buttonText}</button>
<button type="button" style="border:none;width: 100%; text-align:left;" class="collapsible">${buttonText}</button>
<div class="documentPart autoExpand articleExcerpt" id="anchor-${path}" style="display:block;">
</#list>
</#macro>
<#macro arrangeSources sources counter identifier filter="none">
<#if sources?? && sources?has_content && counter &gt; 0>
<button type="button" class="collapsible" style="border: none; color: #8B4513; padding: 18px;width: 100%;text-align:left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Источники</button>
<button type="button" class="collapsible" style="border: none; color: #8B4513;width: 100%;text-align:left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Источники</button>
<div class="autoExpand documentPart works" id="anchor-${identifier}-sources" style="display:block;">
<#assign lastSource = ""/>
<#list sources as source>
@ -141,7 +141,7 @@
<#macro arrangeLiterature literature counter identifier filter="none">
<#if literature?? && literature?has_content && counter &gt; 0>
<button type="button" class="collapsible" style="border:none; color: #8B4513; padding: 18px;width: 100%; text-align: left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Литература</button>
<button type="button" class="collapsible" style="border:none; color: #8B4513;width: 100%; text-align: left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Литература</button>
<div class="autoExpand documentPart bibliography" id="anchor-${identifier}-literature" style="display:block;">
<#assign lastLiterature = ""/>
<#list literature as literatureItem>
@ -158,26 +158,26 @@
<#macro authors_metadata>
<#if authors??>
<#list authors as author>
<div class="affiliations" >
<div class="collapsible collapsed">
<div class="collapsibleLink" style="display:inline;">
<b><#if author.authorFamily??>${author.authorFamily}&nbsp;</#if><#if author.authorGivenName??>${author.authorGivenName}</#if></b>
</div>
</div>
<div class="expandedAffilations" style="display:none;">
<#if author.orgName??>
<span>${author.orgName}</span>
</#if>
<#if author.orgAddress??>
<br>
<span>Адрес организации: <#if author.orgPostalCode??>${author.orgPostalCode},&nbsp;</#if>${author.orgAddress}&nbsp;</span>
</#if>
</div>
</div>
<#if authors?? && authors?has_content>
<div class="collapsible collapsed">
<div class="collapsibleLink" style="display:inline;">Авторы:</div>
</div>
<div class="expandedAuthors" style="display:none;">
<#list authors as author>
<div class="affilation">
<b><#if author.authorFamily??>${author.authorFamily}&nbsp;</#if><#if author.authorGivenName??>${author.authorGivenName}</#if></b>
<#if author.orgName??>
<span class="authorOrgName">${author.orgName}</span>
</#if>
<#if author.orgAddress??>
<br>
<span class="authorOrgAdress">Адрес организации: <#if author.orgPostalCode??>${author.orgPostalCode},&nbsp;</#if>${author.orgAddress}&nbsp;</span>
<br>
</#if>
</div>
</#list>
</#if>
</div>
</#if>
</#macro>