litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use attribute for excerpts names

Browse source
This commit is contained in:
Georgy Litvinov 2021-09-28 22:21:19 +02:00
parent 258590dc24
commit 6f7f5e3dd3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
View file

@ -173,8 +173,8 @@
iframeDoc.getElementById('newCompilationLabel').value = compilationName; iframeDoc.getElementById('newCompilationLabel').value = compilationName;
var excerpts = $('.compilationDraftExcerpt').toArray(); var excerpts = $('.compilationDraftExcerpt').toArray();
for (i = 0;i < excerpts.length;i++){ for (i = 0;i < excerpts.length;i++){
var excerptUri = excerpts[i].getAttribute('parturi'); var excerptUri = excerpts[i].getAttribute('partUri');
var excerptName = $(excerpts[i]).children('button').html(); var excerptName = excerpts[i].getAttribute('partName');
var number = i + 1; var number = i + 1;
iframeDoc.getElementById("tocLevel" + number + "Name").value = excerptName + " (" + compilationName + ")"; iframeDoc.getElementById("tocLevel" + number + "Name").value = excerptName + " (" + compilationName + ")";
iframeDoc.getElementById("tocItem" + number + "Name").value = excerptName + " (" + compilationName + ")"; iframeDoc.getElementById("tocItem" + number + "Name").value = excerptName + " (" + compilationName + ")";

4
webapp/src/main/webapp/themes/iph/templates/elenphExcerptShortView.ftl
View file

@ -4,7 +4,6 @@
<#import "lib-vivo-properties.ftl" as p> <#import "lib-vivo-properties.ftl" as p>
<#-- <@dumpAll /> --> <#-- <@dumpAll /> -->
<div class="virtualArticlePart compilationDraftExcerpt" partUri="${individual.uri}" style="display:none;">
<#list excerptInfo as excerptProperties> <#list excerptInfo as excerptProperties>
<#if excerptProperties.property == "https://litvinovg.pro/text_structures#htmlExcerpt"> <#if excerptProperties.property == "https://litvinovg.pro/text_structures#htmlExcerpt">
<#assign excerptText = excerptProperties.value > <#assign excerptText = excerptProperties.value >
@ -17,6 +16,7 @@
</#if> </#if>
</#list> </#list>
<#if excerptText?? && excerptTextName?? && excerptTextName?has_content && excerptText?has_content> <#if excerptText?? && excerptTextName?? && excerptTextName?has_content && excerptText?has_content>
<div class="virtualArticlePart compilationDraftExcerpt" partUri="${individual.uri}" partName="${excerptTextName}" style="display:none;">
<button type="button" style="border:none;width: 100%; text-align:left;" class="collapsible">${excerptTextName}</button> <button type="button" style="border:none;width: 100%; text-align:left;" class="collapsible">${excerptTextName}</button>
<div class="htmlExcerpt" style="list-style:none; display:none;"> <div class="htmlExcerpt" style="list-style:none; display:none;">
${excerptText} ${excerptText}
@ -38,8 +38,8 @@
</div> </div>
</div>
</#if> </#if>
</div>
<div class="searchResult"> <div class="searchResult">
<a href="${individual.profileUrl}" title="${i18n().individual_name}">${individual.name}</a> <a href="${individual.profileUrl}" title="${i18n().individual_name}">${individual.name}</a>