From d98ec70ff7e13bebc16646d912462f37fa7cec19 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Wed, 3 Mar 2021 17:26:00 +0100
Subject: [PATCH] Move authors metadata to macro

---
 .../themes/iph/templates/compilation.ftl       | 16 +---------------
 .../themes/iph/templates/elenphAritcle.ftl     | 16 +---------------
 .../webapp/themes/iph/templates/text-lib.ftl   | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
index f8696875..f1269194 100644
--- a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl
@@ -132,21 +132,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
     </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>
+<@authors_metadata />
 
 <@documentRubrics />
 
diff --git a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
index 470bc8bf..91a74110 100644
--- a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl
@@ -108,21 +108,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/co
     </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>
+<@authors_metadata />
 
 <@documentRubrics />
 
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 d7b1e8bf..a1fd92dc 100644
--- a/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/text-lib.ftl
@@ -73,7 +73,7 @@
 	    	<@arrangeLiterature bibliography bibliography?size order.elenphExcerpt />
 	      </div>
 	    </#if> 
-	  </div> <#-- articleExcerpt -->
+	  </div>
 	 </#list>
 	</div>
 	<@arrangeSources works works?size />
@@ -111,6 +111,22 @@
 </#macro>
 
 
+<#macro authors_metadata>
+	<#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>
+</#macro>
 
 
 <#macro authors_underline>