Merge pull request slub#19 from opencultureconsulting/Full-text-featu…

…res-main 13.02.
effective-webwork · Feb 14, 2024 · 1ee05a6 · 1ee05a6
2 parents bcd9fa7 + 0ee231a
commit 1ee05a6
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 30 deletions.
diff --git a/Resources/Private/Layouts/KitodoPage.html b/Resources/Private/Layouts/KitodoPage.html
@@ -11,6 +11,8 @@
 <div class="main-wrapper">
     <f:if condition="{gp-multiview}">
         <f:then>
+            <f:render section="ControlBar" partial="ControlBar" arguments="{_all}" />
+
             <f:render section="PageView" partial="PageView" arguments="{_all}" />
         </f:then>
         <f:else>

diff --git a/Resources/Private/Partials/ControlBar.html b/Resources/Private/Partials/ControlBar.html
@@ -3,7 +3,7 @@
       lang="en">
 
 <f:section name="ControlBar">
-  <div class="control-bar">
+  <div class="control-bar {f:if(condition:'{gp-multiview}', then:'multiview')}">
       <div class="header-bar">
         <h1><f:link.page pageUid="{rootPageId}" title="DFG-Viewer" class="dfgviewer-logo">DFG-Viewer</f:link.page></h1>
         <nav>

diff --git a/Resources/Private/Partials/PageView.html b/Resources/Private/Partials/PageView.html
@@ -3,7 +3,7 @@
   xmlns:dc="http://typo3.org/ns/Slub/SlubDigitalcollections/ViewHelpers" data-namespace-typo3-fluid="true" lang="en">
 
 <f:section name="PageView">
-<div class="document-view">
+<div class="document-view {f:if(condition:'{gp-multiview}', then:'multiview')}">
   <div id="browser-hint" class="hidden">
     <div class="alert">
       <span class="closebtn" onclick="hideBrowserAlert()">&times;</span>
@@ -269,7 +269,7 @@ <h2>
                 <f:else>
                   <f:if condition="{gp-pagegrid} == 1">
                     <f:then>
-                      <span class="select switchoff" id="tx-dlf-tools-score" title="{f:translate(key:'score.no_score_gridpage', extensionName:'dfgviewer')}"><f:translate key='score.no_score_gridpage' extensionName='dfgviewer' /></span>
+                      <span class="select switchoff" id="tx-dlf-tools-score-0" title="{f:translate(key:'score.no_score_gridpage', extensionName:'dfgviewer')}"><f:translate key='score.no_score_gridpage' extensionName='dfgviewer' /></span>
                     </f:then>
                     <f:else>
                       <f:cObject typoscriptObjectPath="plugin.tx_dlf_scoretool" />

diff --git a/Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html b/Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html
@@ -14,38 +14,40 @@
       data-namespace-typo3-fluid="true">
 <f:if condition="{docArray -> f:count()} > 1">
     <f:then>
+        <div class="multiViewNavigation">
+            <f:form method="post" action="addDocument" addQueryString="1" name="formAddDocument" object="{formAddDocument}">
+                <f:form.textfield property="location"/>
+                <f:form.submit value="Submit" />
+            </f:form>
+            <f:link.action addQueryString="1" additionalParams="{navigateAllPagePrev}"
+                           argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docMeasure]'}">
+                <f:translate key="prevPage"/>
+            </f:link.action>
+            <f:link.action addQueryString="1" additionalParams="{navigateAllPageNext}"
+                           argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docMeasure]'}">
+                <f:translate key="nextPage"/>
+            </f:link.action>
+            <f:link.action addQueryString="1" additionalParams="{navigateAllMeasurePrev}"
+                           argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docPage]'}">
+                <f:translate key="prevMeasure"/>
+            </f:link.action>
+            <f:link.action addQueryString="1" additionalParams="{navigateAllMeasureNext}"
+                           argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docPage]'}">
+                <f:translate key="nextMeasure"/>
+            </f:link.action>
 
-        <div class="grid-stack">
-            <div class="grid-stack-item" gs-w="5" gs-h="2">
-                <div class="grid-stack-item-content">
-                    <div class="drag">Drag</div>
-                    <f:form method="post" action="addDocument" addQueryString="1" name="formAddDocument" object="{formAddDocument}">
-                        <f:form.textfield property="location"/>
-                        <f:form.submit value="Submit" />
-                    </f:form>
-                    <f:link.action addQueryString="1" additionalParams="{navigateAllPagePrev}"
-                                   argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docMeasure]'}">
-                        <f:translate key="prevPage"/>
-                    </f:link.action>
-                    <f:link.action addQueryString="1" additionalParams="{navigateAllPageNext}"
-                                   argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docMeasure]'}">
-                        <f:translate key="nextPage"/>
-                    </f:link.action>
-                    <f:link.action addQueryString="1" additionalParams="{navigateAllMeasurePrev}"
-                                   argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docPage]'}">
-                        <f:translate key="prevMeasure"/>
-                    </f:link.action>
-                    <f:link.action addQueryString="1" additionalParams="{navigateAllMeasureNext}"
-                                   argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[docPage]'}">
-                        <f:translate key="nextMeasure"/>
-                    </f:link.action>
-                </div>
-            </div>
+            <a href="" class="resetLayout">Reset Layout</a>
+        </div>
 
+
+        <div class="grid-stack">
             <f:for each="{docArray}" as="document" iteration="iterator">
-                <div class="grid-stack-item" gs-w="5" gs-h="5">
+                <div class="grid-stack-item" gs-w="5" gs-h="5" gs-min-w="6" gs-min-h="6" gs-id="{iterator.index}">
                     <div class="grid-stack-item-content">
                         <div class="drag">Drag</div>
+                        <div>
+
+                        </div>
                         <div id="tx-dfgviewer-map-{iterator.index}" data-viewercount="{iterator.index}" class="tx-dlf-map">
                         </div>
                         <div id="svg_panel" >
@@ -56,6 +58,32 @@
                             <div id="tx-dlf-score-{iterator.index}"></div>
                         </div>
                         <f:variable name="curDocPage" value="{docPage.{iterator.index}}" />
+
+                        <div class="score-tool">
+                            <f:if condition="{scoreAvailable.{iterator.index}}">
+                                <f:then>
+                                    <a class="select switchoff" id="tx-dlf-tools-score-{iterator.index}" 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}">
+                                       Score &nbsp;
+                                    </a>
+                                    <a class="select switchoff" id="tx-dlf-tools-midi" title=""
+                                       data-dic=""> Midi &nbsp;
+                                    </a>
+                                </f:then>
+                                <f:else>
+                                    <span class="no-score">
+                                        <f:translate key="tools.fulltext.not-available"/>
+                                    </span>
+                                </f:else>
+                            </f:if>
+                            <f:comment><f:cObject typoscriptObjectPath="plugin.tx_dlf_scoretool" /></f:comment>
+                        </div>
+
                         <div class="tx-dlf-navigation-prev">
                             <f:if condition="{docPage.{iterator.index}} > 1">
                                 <f:then>
@@ -107,6 +135,9 @@
             <div id="player" style="z-index: 0; position: absolute;"></div>
             <div id="svg_output" style="overflow:hidden;"></div>
         </div>
+
+        <f:comment><f:cObject typoscriptObjectPath="plugin.tx_dlf_scoretool" /></f:comment>
+
         <div class="score-container">
             <div id="tx-dlf-score-0"></div>
         </div>

diff --git a/Resources/Public/Css/allStyles.css b/Resources/Public/Css/allStyles.css
@@ -2021,6 +2021,11 @@ a {
   -o-transition: all 0.18s ease-in-out;
   transition: all 0.18s ease-in-out;
 }
+
+.document-view.multiview {
+  overflow: scroll;
+}
+
 .fullscreen .document-view {
   top: 0px;
   right: 0px;