Merge branch 'project-musical-sources' into Full-text-features-main

effective-webwork · Feb 14, 2024 · 0ee231a · 0ee231a
2 parents 0cd7f71 + bcd9fa7
commit 0ee231a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/Classes/Controller/UriController.php b/Classes/Controller/UriController.php
@@ -48,7 +48,7 @@ public function mainAction()
     {
         // Load current document.
 
-        $this->loadDocument($this->requestData);
+        $this->loadDocument();
 
         if ($this->document === null) {
             return;

diff --git a/Resources/Private/Layouts/KitodoPage.html b/Resources/Private/Layouts/KitodoPage.html
@@ -20,7 +20,7 @@
 
             <f:render section="PageView" partial="PageView" arguments="{_all}" />
 
-            <f:render section="AnnotationBar" partial="AnnotationsBar" arguments="{_all}" />
+            <f:comment><f:render section="AnnotationBar" partial="AnnotationsBar" arguments="{_all}" /></f:comment>
         </f:else>
     </f:if>
 </div>

diff --git a/Resources/Private/Partials/PageView.html b/Resources/Private/Partials/PageView.html
@@ -42,19 +42,14 @@ <h2>
                   <f:cObject typoscriptObjectPath="plugin.tx_dlf_pageview" />
                   <f:cObject typoscriptObjectPath="plugin.tx_dlf_audioplayer" />
                   <div class="fulltext-container"><div id="tx-dlf-fulltextselection"></div></div>
+                  <f:comment>
+                  <div class="score-container">
+                    <div id="tx-dlf-score"></div>
+                  </div>
+                  <div id="player"></div>
+                  </f:comment>
                 </f:else>
               </f:if>
-
-                <f:cObject typoscriptObjectPath="plugin.tx_dlf_audioplayer" />
-                <div class="fulltext-container">
-                    <div id="tx-dlf-fulltextselection"></div>
-                </div>
-                <f:comment>
-                <div class="score-container">
-                    <div id="tx-dlf-score"></div>
-                </div>
-                <div id="player"></div>
-                </f:comment>
             </f:else>
           </f:if>
         </f:else>

diff --git a/Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html b/Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html
@@ -130,8 +130,7 @@
         </div>
     </f:then>
     <f:else>
-        <div id="tx-dfgviewer-map" class="tx-dlf-map">
-        </div>
+        <div id="tx-dfgviewer-map" class="tx-dlf-map"></div>
         <div id="svg_panel" >
             <div id="player" style="z-index: 0; position: absolute;"></div>
             <div id="svg_output" style="overflow:hidden;"></div>

diff --git a/Resources/Public/Css/annotationStyles.css b/Resources/Public/Css/annotationStyles.css
@@ -40,7 +40,7 @@
 }
 
 .document-view {
-    right: 25%;
+/*    right: 25%; */
 }
 
 .annotation-list-item details.hover {