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

Added metadata switcher.

Browse source
This commit is contained in:
Svetlana Rastegina 2021-03-24 14:40:05 +01:00 • committed by Georgy Litvinov
parent 7c1d0457cf
commit a3768cdc78
3 changed files with 72 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2893,7 +2893,7 @@ span.iconControlsEditable {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-end;
justify-content: space-between;
border-bottom: 1px solid #8B4513;
background-color: #F6F6F6;
width: 100%;
@ -3008,9 +3008,11 @@ span.iconControlsEditable {
padding-right: 10px;
padding-bottom: 10px;
border-bottom: 1px dashed #9C9C9C;
background-color: #FDF5E6;
}
.collapsible.collapsed {
padding: 4px 4px 4px 10px;
padding: 4px 4px 4px 10px;
background-color: #fdfaf5;
}
.collapsible.collapsed >div.collapsibleLink {
background-image: url(../images/arrow-down-big.svg);
@ -3023,7 +3025,8 @@ span.iconControlsEditable {
font-weight: normal;
}
.collapsible.expanded {
padding: 8px 8px 8px 10px;
padding: 4px 4px 4px 10px;
background-color: #fdfaf5;
}
.collapsible.expanded >div.collapsibleLink {
background-image: url(../images/arrow-top-big.svg);
@ -3119,23 +3122,21 @@ label.switch >.collapseTextControl >img {
padding-left: 6px;
}
.firstPub {
border-bottom: 1px solid #dde4e3;
padding-bottom: 10px;
background-color: #fffcf7;
padding-top: 10px;
padding-left: 15px;
padding-bottom: 15px;
padding-top: 8px;
}
.firstPub .label {
font-family: "IPH Astra Serif";
font-size: 1.3rem;
font-size: 1.2rem;
margin-top: 0px;
margin-bottom: .2em;
}
.firstPub li {
font-family: "IPH Astra Serif";
font-size: 1.2rem;
}
.affilation {
margin-bottom: 10px;
margin-bottom: 12px;
}
.expandedAuthors >.affilation {
font-family: "IPH Astra Serif";
@ -3144,13 +3145,14 @@ label.switch >.collapseTextControl >img {
.expandedAuthors >.affilation >b {
font-family: "IPH Astra Serif";
font-size: 1.2rem;
padding: 5px;
border-bottom: 1px solid #dde4e3;
padding-top: 6px;
padding-bottom: 5px;
padding-right: 5px;
border-bottom: 1px dashed #dde4e3;
border-top: 1px solid #dde4e3;
display: block;
font-weight: normal;
margin-bottom: 8px;
background-color: #F6F6F6;
font-weight: bold;
margin-bottom: 4px;
}
.authorOrgName {
font-family: "IPH Astra Serif";
@ -3226,6 +3228,32 @@ label.switch >.collapseTextControl >img {
background-position: center center;
outline: none;
}
.toolsWrapper {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-end;
}
#metadataExpandCB {
display: none;
}
.metaDataName {
text-transform: uppercase;
border-bottom:1px solid #dde4e3;
}
.metaDataName.collapsible.collapsed > div.collapsibleLink {
font-size: 1.1rem;
}.metaDataName.collapsible.expanded > div.collapsibleLink {
font-size: 1.1rem;
}
.metaDataName.collapsible.collapsed {
padding: 10px;
background-color: #FDF5E6;
}
.metaDataName.collapsible.expanded {
padding: 10px;
background-color: #FDF5E6;
}
/* -------------------------------------------------> */
/* FONTS --------------------------------> */
/* -------------------------------------------------> */

50
webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
View file

@ -69,18 +69,21 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
</#if>
</div>
<div class="articleToolsContainer">
<div class="articleButtons">
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess></#if>>
<#include "individual-iconControls-iph.ftl">
</span>
<div class="metadataSwitch">
<@expandMetadataSwitch />
</div>
<div class="toolsWrapper">
<div class="articleButtons">
<span id="iconControlsRightSide" class="<#if editable>iconControlsEditable<#else>iconControlsNotEditable</#if>" <#if !user.hasSiteAdminAccess></#if>>
<#include "individual-iconControls-iph.ftl">
</span>
<#if editable && profilePageTypesEnabled >
<#include "individual-profilePageTypes.ftl">
</#if>
<button id="print"><img onclick="javascript:printPageContent();" src="${urls.base}/themes/iph/images/print.svg"></button>
</div>
<#if editable && profilePageTypesEnabled >
<#include "individual-profilePageTypes.ftl">
</#if>
<button id="print"><img onclick="javascript:printPageContent();" src="${urls.base}/themes/iph/images/print.svg"></button>
</div>
<@expandSwitch />
<@expandMetadataSwitch />
</div>
</div>
</header>
@ -108,18 +111,21 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
</#if>
<#assign firstPub = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#firstPublication")!>
<#if firstPub.statements?has_content && firstPub.type == "data">
<div class="firstPub" style="list-style:none;">
<div class="label">Первая публикация статьи
</div>
<@p.dataPropertyList firstPub editable />
</div>
</#if>
<@authors_metadata />
<@documentRubrics />
<div class="metaDataName collapsible collapsed">
<div class="collapsibleLink" style="display:inline;">Метаданные документа</div>
</div>
<div class="autoMetadataExpand" style="display:none;">
<#assign firstPub = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#firstPublication")!>
<#if firstPub.statements?has_content && firstPub.type == "data">
<div class="firstPub" style="list-style:none;">
<div class="label">Первая публикация статьи
</div>
<@p.dataPropertyList firstPub editable />
</div>
</#if>
<@authors_metadata />
<@documentRubrics />
</div>
<@arrangeDocumentParts />
<@authors_underline />

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

@ -44,7 +44,7 @@
</div>
</#if>
<#if rubrics?? && rubrics?has_content>
<div class="expandedContent" style="display:none;">
<div class="expandedContent autoMetadataExpand" style="display:none;">
<#list rubrics as rubric>
<li role="listitem" style="list-style:none;">
<a href="${urls.base}/individual?uri=${rubric.rubricID?url}"">${rubric.rubricName}</a>