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

Modifications for correct affiliation display

Browse source
This commit is contained in:
Georgy Litvinov 2020-11-25 18:09:03 +01:00
parent d27dc44f43
commit 6e905508b4
6 changed files with 269 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

29
webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl
View file

@ -123,6 +123,23 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
</div>
</#if>
-->
<#if authors??>
<#list authors as author>
<div class="affiliations" >
<b><#if author.authorFamily??>${author.authorFamily}&nbsp;</#if><#if author.authorGivenName??>${author.authorGivenName}</#if></b>
<#if author.orgName??>
<br><span style="color:rgba(0,0,0,0.54);">${author.orgName}</span>
</#if>
<#if author.orgAddress??>
<br>
<span style="color:rgba(0,0,0,0.54);">Адрес организации: <#if author.orgPostalCode??>${author.orgPostalCode},&nbsp;</#if>${author.orgAddress}&nbsp;</span>
</#if>
</div>
</#list>
</#if>
<#assign articleRubrics = propertyGroups.pullProperty("https://iph.ras.ru/relationships#belongsTo")!>
<#if articleRubrics?? && articleRubrics?has_content>
<div class="label">Относится к рубрикам: <@p.addLink articleRubrics editable /> <@p.verboseDisplay articleRubrics /></div>
@ -208,17 +225,11 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
</#if>
<#if authors??>
<#assign no_authors = true>
<#list authors as author>
<#if no_authors>
<div class="authors" style="display:block;float:right; margin:15px;">
<#assign no_authors = false>
<#else>
", "
</#if>
${author.author}
<div class="authors" style="display:block;float:right; margin:15px;">
<#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if>
</div>
</#list>
</div> <#-- authors class-->
</#if>
<script>

42
webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
View file

@ -90,7 +90,33 @@
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
</#if>
<#if !editable>
<#if authors??>
<#list authors as author>
<div class="affiliations" >
<b><#if author.authorFamily??>${author.authorFamily}&nbsp;</#if><#if author.authorGivenName??>${author.authorGivenName}</#if></b>
<#if author.orgName??>
<br><span style="color:rgba(0,0,0,0.54);">${author.orgName}</span>
</#if>
<#if author.orgAddress??>
<br>
<span style="color:rgba(0,0,0,0.54);">Адрес организации: <#if author.orgPostalCode??>${author.orgPostalCode},&nbsp;</#if>${author.orgAddress}&nbsp;</span>
</#if>
</div>
</#list>
</#if>
<#else>
<#assign pubAuthors = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#hasAuthor")!>
<#if pubAuthors?has_content>
<div class="label">Авторы: <@p.addLink pubAuthors editable /> <@p.verboseDisplay pubAuthors /> </div>
<#if pubAuthors.statements?has_content >
<div class="pubAuthors" style="list-style:none;">
<@p.objectProperty pubAuthors editable />
</div>
</#if>
</#if>
</#if>
<#if articles?has_content>
<div class="label">В составе статей: </div>
<div>
@ -104,22 +130,6 @@
</div>
</#if>
<#assign author = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#author")!>
<#if author?has_content || editable >
<div class="label">Авторы: <@p.addLink author editable /> <@p.verboseDisplay author /> </div>
<#if author.statements?has_content && author.type == "data">
<div class="author" style="list-style:none;">
<@p.dataPropertyList author editable />
</#if>
</#if>
<#assign affiliation = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#affiliation")!>
<#if affiliation.statements?has_content && affiliation.type == "data">
<div class="affiliation" style="list-style:none;">
<div class="label">Аффилиация</div>
<@p.dataPropertyList affiliation editable />
</div>
</#if>
<#assign rubrics = propertyGroups.pullProperty("https://iph.ras.ru/relationships#belongsTo")!>
<#if rubrics?has_content>
<div class="label">Относится к: <@p.addLink rubrics editable /> <@p.verboseDisplay rubrics /> </div>

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

@ -1797,3 +1797,7 @@ span.subclassExpandMinus {
background:url(../images/green_minus_sign.gif) right center no-repeat;
min-height:18px;
}
.affiliations {
margin-bottom: 1.5em;
}