From 4969868784bd2c457360a86e6e7491b320abaff5 Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Tue, 23 Mar 2021 12:21:53 +0100
Subject: [PATCH] Modified metadata styles on Exerpt page.

---
 webapp/src/main/webapp/themes/iph/css/iph.css | 24 ++++++++++++-
 .../themes/iph/templates/elenphExcerpt.ftl    | 36 +++++++++++--------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index 0f782c33..955f595f 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -2165,7 +2165,8 @@ p.address-line {
 }
 /* EDITING DISPLAY------>  */
 .edit-individual {
-    border-left: 1px dotted #B2D15A;
+    border-left: 1px dotted #8B4513;
+    margin-left: 5px;
 }
 /* ------------------------------------------------->  */
 /* SITE ADMIN DASHBOARD ---------------------------->  */
@@ -3125,6 +3126,27 @@ label.switch >#collapseTextControl >img {
 	font-size: 1.1rem;
 	color: #4F4F4F;
 }
+.wrapperExpandedKeywords {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	list-style: none;
+	border-top: 1px solid #dde4e3;
+	padding-top: 10px;
+}
+.wrapperExpandedKeywords >li {
+	border-right: 1px solid #8B4513;
+	font-size: 1.2rem;
+	font-family: "IPH Astra Serif";
+	padding-right: 8px;
+	padding-left: 8px;
+	margin-bottom: 5px;
+	margin-top: 5px;
+}
+.wrapperExpandedKeywords > li:last-child {
+	border-right: none;
+}
 /* ------------------------------------------------->  */
 /* FONTS  -------------------------------->  */
 /* ------------------------------------------------->  */
diff --git a/webapp/src/main/webapp/themes/iph/templates/elenphExcerpt.ftl b/webapp/src/main/webapp/themes/iph/templates/elenphExcerpt.ftl
index c9b4f74b..9ef6eeac 100644
--- a/webapp/src/main/webapp/themes/iph/templates/elenphExcerpt.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/elenphExcerpt.ftl
@@ -116,15 +116,17 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
 </#if>
 
  <#if articles?has_content>
-   <div class="label">В составе статей: </div>
-   <div>
-    <#list articles as article>
-     <#if article?has_content >
-       <div style="list-style:none;border:none;width: 100%;text-align:left;" class="article">
-         <a href="${urls.base}/individual?uri=${article.articleUri?url}"">${article.articleName}</a>
-       </div>
-     </#if>
-    </#list>
+   <div class="collapsible collapsed"> 
+  	 <div class="collapsibleLink" style="display:inline;">В составе статей:</div>
+   </div>
+   		<div class="expandedArticles" style="display:none;">
+   		 <#list articles as article>
+     		<#if article?has_content >
+      		  <div class="articleList" style="list-style:none;">
+        		<a href="${urls.base}/individual?uri=${article.articleUri?url}"">${article.articleName}</a>
+    		  </div>
+    		</#if>
+   		 </#list>
    </div>
  </#if>
 
@@ -140,12 +142,16 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/themes/iph/js/to
   
   <#assign keywords = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#keywords")!>
   <#if keywords?has_content >
-    <div class="label">Ключевые слова: <@p.addLink keywords editable /> <@p.verboseDisplay keywords /> </div>
-    <#if keywords.statements?has_content && keywords.type == "data">
-      <div class="keywords" style="list-style:none;">
-          <@p.dataPropertyList keywords editable />
-      </div>
-    </#if>
+    <div class="collapsible collapsed">
+   		 <div class="collapsibleLink" style="display:inline;">Ключевые слова: <@p.addLink keywords editable /> <@p.verboseDisplay keywords /></div>
+    </div>
+    	<div class="expandedKeywords" style="display:none;">
+    		<div class="wrapperExpandedKeywords">
+    			<#if keywords.statements?has_content && keywords.type == "data">
+         			 <@p.dataPropertyList keywords editable />
+   				</#if>
+   			</div>
+   	   </div>
   </#if>
   
  <#assign htmlExcerpt = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#htmlExcerpt")!>