From d3328ebf965374fadf50fb270c0cd9cf513288b2 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Wed, 3 Mar 2021 15:00:38 +0100
Subject: [PATCH] Fix underline authors' list

---
 .../webapp/themes/iph/templates/compilation.ftl     |  8 +-------
 .../webapp/themes/iph/templates/elenphAritcle.ftl   | 13 ++-----------
 .../main/webapp/themes/iph/templates/text-lib.ftl   |  9 +++++++++
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
index cf2914bf..4ea7b81a 100644
--- a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
@@ -227,13 +227,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
 	</#if>
 </div>
 
-<#if authors?? && authors?has_content>
-  <div class="authors" style="display:block;float:right; margin:15px;">
-    <#list authors as author>
-      <#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if>
-    </#list>
-  </div>
-</#if>
+<@authors_underline />
 
  <#-- <@dumpAll /> -->
 
diff --git a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
index 4ab287c2..8da92eef 100644
--- a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
@@ -120,7 +120,6 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
         <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>
@@ -198,17 +197,9 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
     </div>
 </#if>
 
-<#if authors?? && authors?has_content>
-  <div class="authors" style="display:block;">
-    <#list authors as author>
-      <#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if>
-    </#list>
-  </div>
-</#if>
+<@authors_underline />
 
- <#-- <@dumpAll /> -->
-
- <#assign selectedTemplate = "individual--foaf-person-2column.ftl" > 
+<#assign selectedTemplate = "individual--foaf-person-2column.ftl" > 
 
 <#if profilePageTypesEnabled >
     <#assign profilePageType = profileType >
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 dc9549ab..82cd7f92 100644
--- a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
@@ -52,6 +52,15 @@
 	</#if>
 </#macro>
 
+<#macro authors_underline>
+	<#if authors?? && authors?has_content>
+	  <div class="authors" style="display:block;float:right; margin:15px;">
+	    <#list authors as author>
+	      <#if author.authorFamily??>${author.authorFamily?trim}<#if author.authorInitials??>&nbsp;${author.authorInitials?trim}</#if></#if><#sep>, 
+	    </#list>
+	  </div>
+	</#if>
+</#macro>
 
 <#macro expandSettingsSwitch >
 	<div class="expandSettingsSwitch">