Merge pull request #107 from markusweigelt/musical-sources-fixes

[BUGFIX] Improve score tool conditions
slub · Feb 13, 2025 · 124ea2c · 124ea2c
2 parents 42d320a + b735ead
commit 124ea2c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
@@ -89,10 +89,6 @@
 				<source><![CDATA[No fulltext in gridpage mode.]]></source>
 				<target><![CDATA[Keine Volltexte in der Vorschau-Ansicht.]]></target>
 			</trans-unit>
-			<trans-unit id="score.no_score_gridpage" approved="yes">
-				<source><![CDATA[No fulltext in gridpage mode.]]></source>
-				<target><![CDATA[Keine Notentexte in der Vorschau-Ansicht.]]></target>
-			</trans-unit>
 			<trans-unit id="gridpage.preview" approved="yes">
 				<source><![CDATA[Thumbnail Preview]]></source>
 				<target><![CDATA[Vorschaubilder]]></target>

diff --git a/Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html
@@ -107,29 +107,18 @@
     </f:then>
 </f:if>
 
-<f:if condition="{settings.tools} == 'scoretool'">
+<f:if condition="{renderScoreTool} && {score}">
     <f:then>
-        <f:if condition="{score}">
-            <f:then>
-                <a class="select switchoff" id="tx-dlf-tools-score-0" title=""
-                    data-dic="fulltext:{f:translate(key: 'tools.score')}
-                            ;fulltext-on:{f:translate(key: 'tools.score.on')}
-                            ;fulltext-off:{f:translate(key: 'tools.score.off')}
-                            ;activate-score-initially:{activateScoreInitially}
-                            ;score-scroll-element:{settings.scoreScrollElement}
-                            ;search-hl-parameters:{settings.searchHlParameters}">
-                    &nbsp;
-                </a>
-                <a class="select switchoff" id="tx-dlf-tools-midi" title=""
-                    data-dic=""> &nbsp;
-                </a>
-            </f:then>
-            <f:else>
-                <span class="no-score">
-                    <f:translate key="tools.fulltext.not-available"/>
-                </span>
-            </f:else>
-        </f:if>
+        <li class="score">
+            <a class="select switchoff" id="tx-dlf-tools-score-0" title="">
+                <f:translate key="tools.score"/>
+            </a>
+        </li>
+        <li class="score">
+            <a id="tx-dlf-tools-midi" >
+                <f:translate key="tools.score.player"/>
+            </a>
+        </li>
     </f:then>
 </f:if>
 
@@ -209,14 +198,20 @@
                 </li>
             </f:then>
         </f:if>
-        <li>
-            <a href="#" id="tx_dlf_mididownload"  class="download-document">
-                <f:translate key="mididownload"/> (MIDI)
-            </a>
-            <a href="#" id="tx_dlf_scoredownload" class="download-document">
-                <f:translate key="scoredownload"/> (PDF)
-            </a>
-        </li>
+        <f:if condition="{scoreLinks}">
+            <f:then>
+                <li>
+                    <a href="#" id="tx_dlf_mididownload" class="download-document">
+                        <f:translate key="mididownload"/>
+                        (MIDI)
+                    </a>
+                    <a href="#" id="tx_dlf_scoredownload" class="download-document">
+                        <f:translate key="scoredownload"/>
+                        (PDF)
+                    </a>
+                </li>
+            </f:then>
+        </f:if>
     </f:then>
 </f:if>