From f2a86d43ac1aca946e15caabafa8f2b0d88f3de8 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 15 Apr 2021 17:03:10 +0200 Subject: [PATCH] Differentiated sources and literature lists for excerpts and complex texts --- .../webapp/themes/iph/i18n/all.properties | 5 +++++ .../webapp/themes/iph/templates/text-lib.ftl | 22 ++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/webapp/src/main/webapp/themes/iph/i18n/all.properties b/webapp/src/main/webapp/themes/iph/i18n/all.properties index e66f906ad..2dea86d2d 100644 --- a/webapp/src/main/webapp/themes/iph/i18n/all.properties +++ b/webapp/src/main/webapp/themes/iph/i18n/all.properties @@ -107,3 +107,8 @@ faculty_memberships = Faculty Memberships edit_mailing_address = Edit Mailing Address add_capitalized = Add +literature_excerpt_button_text = Литература +literature_all_button_text = Сводная литература +sources_excerpt_button_text = Источники +sources_all_button_text = Сводные источники + diff --git a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl index 71b02e53f..db407ebf9 100644 --- a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl @@ -1,4 +1,3 @@ - <#macro showRubrics> <#assign currentRubrics = propertyGroups.pullProperty("https://iph.ras.ru/relationships#belongsTo")!> <#if currentRubrics?? && currentRubrics?has_content> @@ -124,7 +123,15 @@ <#macro arrangeSources sources counter identifier filter="none"> <#if sources?? && sources?has_content && counter > 0> - + <@compress single_line=true> + +
<#assign lastSource = ""/> <#list sources as source> @@ -140,8 +147,17 @@ <#macro arrangeLiterature literature counter identifier filter="none"> + <#if literature?? && literature?has_content && counter > 0> - + <@compress single_line=true> + +
<#assign lastLiterature = ""/> <#list literature as literatureItem>