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 @@
#if>
#if>
+
<#assign htmlExcerpt = propertyGroups.pullProperty("https://iph.ras.ru/text_structures#htmlExcerpt")!>
- <#if htmlExcerpt.statements?has_content && htmlExcerpt.type == "data">
-
- <@p.dataPropertyList htmlExcerpt editable />
- <#-- object property -->
-
+ <#if htmlExcerpt?has_content >
+ <#if htmlExcerpt.statements?has_content && htmlExcerpt.type == "data">
+
+ <@p.dataPropertyList htmlExcerpt editable />
+ <#-- object property -->
+
+ <#else>
+ Текст отрывка: <@p.addLink htmlExcerpt editable /> <@p.verboseDisplay htmlExcerpt />
+ #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>
<#if (childs > 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('–');
}
});
}
+<#macro openButton childs>
+ <#if childs > 0>
+
+
+ <#else>
+
+ #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 >
-
+
<#if (deep > 1) && (childs > 0)>
<@nestedRubrics allrubrics=rubrics parentUri=innerRubric.uri deep=deep-1 level=level+1 />