Skip to content

Commit

Permalink
Merge branch 'master' into update-typo12
Browse files Browse the repository at this point in the history
  • Loading branch information
@markusweigelt
markusweigelt authored Feb 13, 2025
2 parents 80b234e + 124ea2c commit 0986ca7
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 38 deletions.
4 changes: 0 additions & 4 deletions Resources/Private/Language/de.locallang.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
82 changes: 49 additions & 33 deletions Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,41 +74,51 @@
</f:then>
</f:if>

<f:if condition="{renderModelDownloadTool} && {modelDownload}">
<f:if condition="{renderModelDownloadTool} && {modelUrl}">
<f:then>
<li>
<span class="tx-dlf-tools-modeldownload">
<f:link.external uri="{modelDownload.url}">
<f:link.external uri="{modelUrl}">
<f:translate key="downloadModel" />
</f:link.external>
</span>
</li>
</f:then>
</f:if>

<f:if condition="{settings.tools} == 'scoretool'">
<f:if condition="{renderViewerSelectionTool} && {viewers}">
<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>
<form method="get" action="{f:uri.page(pageUid='{viewData.requestData.pageUid}')}">
<f:if condition="{viewData.requestData.id}">
<f:form.hidden name="tx_dlf[id]" value="{viewData.requestData.id}"/>
</f:if>
<f:if condition="{viewData.requestData.model}">
<f:form.hidden name="tx_dlf[model]" value="{viewData.requestData.model}"/>
</f:if>
<f:form.select id="tx-dlf-viewer-{viewData.uniqueId}" name="tx_dlf[viewer]"
options="{viewers}"
optionValueField="id"
optionLabelField="name"
value="{viewData.requestData.viewer}"
additionalAttributes="{'onchange': 'javascript:this.form.submit();'}"
prependOptionLabel="{f:translate(key: 'tools.viewerselection.default', extensionName: 'dlf')}">
</f:form.select>
<form>
</f:then>
</f:if>

<f:if condition="{renderScoreTool} && {score}">
<f:then>
<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>

Expand Down Expand Up @@ -188,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>

Expand All @@ -219,7 +235,7 @@
<input type="submit" id="tx-dlf-search-in-document-button" value="{f:translate(key: 'search.submit')}" onclick="resetStart();" />
<input type="hidden" id="tx-dlf-search-in-document-start" name="{searchInDocument.labelStart}" value="0" />
<input type="hidden" id="tx-dlf-search-in-document-id" name="{searchInDocument.labelId}" value="{searchInDocument.documentId}" />
<input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.documentPageId}" />
<input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.pageId}" />
<input type="hidden" id="tx-dlf-search-in-document-page" name="{searchInDocument.labelPageUrl}" />
<input type="hidden" id="tx-dlf-search-in-document-highlight-word" name="{searchInDocument.labelHighlightWord}" />
<input type="hidden" id="tx-dlf-search-in-document-encrypted" name="{searchInDocument.labelEncrypted}" value="{searchInDocument.solrEncrypted}" />
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'modify_tables' => '',
'clearCacheOnLoad' => 0,
'lockType' => '',
'version' => '4.0.0',
'version' => '4.1.0',
'constraints' => array(
'depends' => [
'php' => '8.1.0-8.3.99',
Expand Down

0 comments on commit 0986ca7

Please sign in to comment.