From cdc8848c7235d5c8f92284ad2b0ee2c4b2093e8a Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 3 Aug 2020 17:30:00 +0200
Subject: [PATCH] Updates for templates

---
 .../freemarker/elenphExcerpt-internal.ftl        | 15 ++++++++++-----
 .../main/webapp/templates/freemarker/rubrics.ftl | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl b/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
index 01650cde..9c7e409a 100644
--- a/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
@@ -125,12 +125,17 @@
       </div>
     </#if>
   </#if>
+
  <#assign htmlExcerpt = propertyGroups.pullProperty("https://iph.ras.ru/text_structures#htmlExcerpt")!>
-  <#if htmlExcerpt.statements?has_content && htmlExcerpt.type == "data">
-  <div class="htmlExcerpt" style="list-style:none;">
-    <@p.dataPropertyList htmlExcerpt editable />
-    <#-- object property -->
-  </div>
+  <#if htmlExcerpt?has_content >
+	  <#if htmlExcerpt.statements?has_content && htmlExcerpt.type == "data">
+	  <div class="htmlExcerpt" style="list-style:none;">
+		<@p.dataPropertyList htmlExcerpt editable />
+		<#-- object property -->
+	  </div>
+	  <#else>
+        <div class="label">Текст отрывка: <@p.addLink htmlExcerpt editable /> <@p.verboseDisplay htmlExcerpt /> </div>
+	  </#if>
   </#if>
 
   <#assign works = propertyGroups.pullProperty("https://iph.ras.ru/text_structures#works")!>
diff --git a/webapp/src/main/webapp/templates/freemarker/rubrics.ftl b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl
index 75d0b045..ae08ad5a 100644
--- a/webapp/src/main/webapp/templates/freemarker/rubrics.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/rubrics.ftl
@@ -2,7 +2,7 @@
   <#if !rubric.parentUri??>
     <#assign childs = rubric.childs?number>
     <button type="button" style="border:none;padding: 15px;text-align:left; width:100%;" class="collapsible">
-      <#if childs &gt; 0>+</#if><a style="padding-left:15px;" href="individual?uri=${rubric.uri?url}">${rubric.name}</a></button>
+      <@openButton childs=childs/><a style="padding-left:15px;" href="individual?uri=${rubric.uri?url}">${rubric.name}</a></button>
     <div class="rubricContents" style="display:none;">
     <#if (childs &gt; 0) >
       <@nestedRubrics allrubrics=rubrics parentUri=rubric.uri deep=10 level=1 /> 
@@ -20,22 +20,32 @@
 	  coll[i].addEventListener("click", function() {
 		this.classList.toggle("active");
 		var content = this.nextElementSibling;
-		if (content.style.display === "block") {
+        if (content.style.display === "block") {
 		  content.style.display = "none";
+		  $(this).children('.collapsibleSign').text('+');
 		} else {
 		  content.style.display = "block";
+		  $(this).children('.collapsibleSign').text('–');
 		}
 	  });
 	}
 </script>
 
+<#macro openButton childs>
+  <#if childs &gt; 0>
+    <div class="collapsibleSign" style="display:inline-block;width:10px;">+</div>
+  <#else> 
+    <div style="display:inline-block;width:10px;"></div>
+  </#if>
+</#macro>
+
 <#macro nestedRubrics allrubrics parentUri deep level>
   <#assign count = 0>
   <#list allrubrics as innerRubric>
 	<#if innerRubric.parentUri?? && innerRubric.parentUri == parentUri>
       <#assign childs = innerRubric.childs?number>
       <#assign count = count + 1 >
-      <button type="button" style="border:none;padding: 15px 0px 15px ${15+15*level}px;width: 100%; text-align:left;" class="collapsible"><#if childs &gt; 0>+</#if><a style="padding-left:15px;"  href="individual?uri=${innerRubric.uri?url}">${innerRubric.name}</a></button>
+      <button type="button" style="border:none;padding: 15px 0px 15px ${15+15*level}px;width: 100%; text-align:left;" class="collapsible"><@openButton childs=childs /><a style="padding-left:15px;"  href="individual?uri=${innerRubric.uri?url}">${innerRubric.name}</a></button>
       <div class="rubricContents" style="display:none;">
        <#if (deep &gt; 1) && (childs &gt; 0)>
 	     <@nestedRubrics allrubrics=rubrics parentUri=innerRubric.uri deep=deep-1 level=level+1 />