Merge branch 'master' into dependabot/npm_and_yarn/Build/qs-6.11.2

.github/workflows/npm-grunt.yml

@@ -0,0 +1,47 @@
+name: GruntComparison
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: npm
+        cache-dependency-path: './Build/package-lock.json'
+
+    - name: Install and run Grunt
+      working-directory: ./Build
+      run: |
+        npm install -g grunt-cli
+        npm audit fix
+        echo "Running `grunt less`"
+        grunt less
+        echo "Running `grunt terser`"
+        grunt terser
+
+    - name: Test for changes
+      working-directory: ./
+      run: |
+        git diff -- ./Resources/Public/
+        if [ -n "$(git status --porcelain -- ./Resources/Public/)" ]; then
+            echo "Changes detected in compiled files"
+            exit 1
+        else 
+            echo "No changes detected in compiled files"
+        fi

Configuration/RequestMiddlewares.php

@@ -26,7 +26,7 @@
 return [
     'frontend' => [
         'dfgviewer/sru' => [
-            'target' => \Kitodo\Dlf\Middleware\SruMiddleware::class,
+            'target' => Slub\Dfgviewer\Middleware\SruMiddleware::class,
             'after' => [
                 'typo3/cms-frontend/prepare-tsfe-rendering'
             ]

Configuration/TypoScript/Plugins/kitodo.typoscript

@@ -109,6 +109,16 @@ plugin.tx_dlf_tableofcontents {
         menuConf {
             expAll = 1
         }
+        titleReplacements {
+            0 {
+                type = issue
+                fields = type,year
+            }
+            1 {
+                type = volume
+                fields = type,volume
+            }
+        }
     }
 }
 
@@ -164,7 +174,7 @@ plugin.tx_dlf_fulltexttool {
     settings {
         tools = fulltexttool
         activateFullTextInitially = 0
-        fullTextScrollElement = html, body
+        fullTextScrollElement = #tx-dlf-fulltextselection
     }
 }
 
@@ -178,7 +188,8 @@ plugin.tx_dlf_imagemanipulationtool {
 plugin.tx_dlf_pdfdownloadtool < plugin.tx_dlf_toolbox
 plugin.tx_dlf_pdfdownloadtool {
     settings {
-        tools = pdfdownloadtool
+        fileGrpsImageDownload = DEFAULT
+        tools = pdfdownloadtool,imagedownloadtool,fulltextdownloadtool
     }
 }
 
@@ -196,30 +207,23 @@ plugin.tx_dlf_audioplayer {
 # newspaper navigation
 # --------------------------------------------------------------------------------------------------------------------
 
-[getDocumentType("{$config.storagePid}") == "ephemera" or getDocumentType("{$config.storagePid}") == "newspaper"]
+[getDocumentType({$config.storagePid}) == "ephemera" or getDocumentType({$config.storagePid}) == "newspaper"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_anchor
 }
 [END]
 
-[getDocumentType("{$config.storagePid}") == "year"]
+[getDocumentType({$config.storagePid}) == "year"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_year
 }
 [END]
 
-[getDocumentType("{$config.storagePid}") == "issue"]
+[getDocumentType({$config.storagePid}) == "issue"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_issue
 }
 [END]
-
-[getDocumentType("{$config.storagePid}") == "object"]
-page.10.variables {
-  isObject3D = TEXT
-  isObject3D.value = object
-}
-[END]

Resources/Private/JavaScript/dfgviewerScripts.js

@@ -44,6 +44,7 @@ $(document).ready(function() {
 
     // add body class if any calendar is present
     $('.tx-dfgviewer-newspaper-calendar').parents('body').addClass('calendar');
+    $('.tx-dfgviewer-newspaper-years').parents('body').addClass('calendar');
 
     // Inject view switch functions for calendar/list view (initial show calendar)
     $('.tx-dfgviewer-newspaper-calendar .calendar-list-selection a.select-calendar-view, .tx-dfgviewer-newspaper-calendar .calendar-view').addClass('active');

Resources/Private/Less/components/controls.less

@@ -122,6 +122,9 @@
                             &.download-fulltext:before {
                                 background-position: -280px -40px;
                             }
+                            &.no-fulltext:before {
+                                background-position: -280px -40px;
+                            }
                             &.local-presentation:before {
                                 background-position: -440px -80px;
                             }
@@ -137,9 +140,25 @@
                             &.persistence-page:before {
                                 background-position: -320px -80px;
                             }
+                            &.tx-dlf-tools-imagedownload:before {
+                                background-position: -320px -40px;
+                            }
+                            &.tx-dlf-tools-imagedownload {
+                                // override opacity from span
+                                // because tx-dlf-tools-imagedownload is the only one here with span
+                                opacity: 1;
+                                // move over the empty space the hidden `::before` left:
+                                a {
+                                    position: relative;
+                                    left: -40px;
+                                }
+                            }
                         }
                         span {
                             opacity: 0.5;
+                            ::before {
+                                display: none;
+                            }
                         }
                     }
                 }
@@ -940,3 +959,19 @@
         color: black;
     }
 }
+
+/* ==============[ hide page elements in calendar view ]====================================== */
+body.dfgviewer.calendar {
+    .document-functions {
+        display: none;
+    }
+
+    .view-functions {
+        display: none;
+    }
+
+    .tx-dfgviewer-newspaper-calendar, .tx-dfgviewer-newspaper-years {
+        position: relative;
+        top: -80px;
+    }
+}

Resources/Private/Less/modules/gridview.less

@@ -58,7 +58,7 @@
 }
 
 
-.tx-dlf-pagegrid .f3-widget-paginator {
+.tx-dlf-pagegrid .pagination {
     position: absolute;
     bottom: 15px;
     height: 1px;
@@ -139,6 +139,14 @@
                 display: none;
             }
         }
+        li.next, li.previous {
+            a,
+            a:first-child,
+            a:last-child {
+                width: 60px;
+                height: 30px;
+            }
+        }
     }
     @media screen and (min-width: @desktopViewportWidth) {
         font-size: 18px;
@@ -149,5 +157,73 @@
             width: 40px;
             height: 40px;
         }
+        li.next, li.previous {
+            a,
+            a:first-child,
+            a:last-child {
+                width: 90px;
+                height: 40px;
+            }
+        }
     }
 }
+
+// Pagination Box
+.tx-dlf-pagegrid ul.pagination {
+    position: absolute;
+    left: 25px;
+    right: 40px;
+    bottom: 12px;
+    padding-top: 8px;
+    opacity: .95;
+    background-color: @base-blue;
+    border-radius: 5px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.3);
+}
+
+// Pagination elements
+.tx-dlf-pagegrid ul.pagination li {
+    display: inline-block;
+    text-align: center;
+    vertical-align: middle;
+    font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    line-height: 1.4;
+    transform-origin: center bottom;
+    margin-right: 10px;
+    margin-bottom: 8px;
+    border: 1px solid @base-blue;
+    border-radius: 20px;
+    background-color: white;
+    width: 40px;
+    height: 40px;
+}
+
+.tx-dlf-pagegrid ul.pagination li span, .tx-dlf-pagegrid ul.pagination li a {
+    display: inline-block;
+    padding-left: 10px;
+    padding-right: 10px;
+    width: 100%;
+    padding-top: 8px;
+    padding-bottom: 8px;
+}
+
+// Pagination elements: previous and next
+.tx-dlf-pagegrid ul.pagination li.previous, .tx-dlf-pagegrid ul.pagination li.next {
+    width: 140px;
+    height: 40px;
+}
+
+// Pagination elements: disabled
+.tx-dlf-pagegrid ul.pagination li.disabled {
+    opacity: 0.4;
+}
+
+// Pagination elements: current
+.tx-dlf-pagegrid ul.pagination li.current a {
+    color: white;
+    background-color: @light-blue;
+    border: 1px solid white;
+    border-radius: 20px;
+}

Resources/Private/Less/website/searchlist.less

@@ -168,6 +168,58 @@
                     }
                 }
             }
+
+            .pagination {
+                // Pagination elements
+                li {
+                    display: inline-block;
+                    text-align: center;
+                    vertical-align: middle;
+                    font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+                    font-weight: bold;
+                    font-size: 14px;
+                    transform-origin: center bottom;
+                    border: 1px solid @base-blue;
+                    border-radius: 15px;
+                    width: 40px;
+                    height: 40px;
+                    padding-left: 0px;
+                }
+
+                li::before {
+                    display: none;
+                }
+
+                 li span,  li a {
+                    display: inline-block;
+                    padding-left: 10px;
+                    padding-right: 10px;
+                    width: 100%;
+                    padding-top: 7px;
+                }
+
+                // Pagination elements: previous and next
+                 li.previous,  li.next {
+                    width: 140px;
+                    height: 40px;
+                }
+
+                // Pagination elements: disabled
+                 li.disabled {
+                    opacity: 0.3;
+                }
+
+                // Pagination elements: current
+                 li.current a {
+                    color: white;
+                    background-color: @light-blue;
+                    opacity: 0.5;
+                    border: 1px solid @base-blue;
+                    border-radius: 15px;
+                    width: 40px;
+                    height: 40px;
+                }
+            }
         }
     }
 }

Resources/Private/Partials/PageView.html

@@ -31,19 +31,13 @@ <h2>
               <f:cObject typoscriptObjectPath="plugin.tx_dfgviewer_newspapercalendar" />
             </f:then>
             <f:else>
-              <f:if condition="{isObject3D} == 'object'">
-                <f:then>
-                  <f:cObject typoscriptObjectPath="plugin.tx_dlf_view3d" />
-                </f:then>
-                <f:else>
-                  <f:if condition="{isNewspaper} == 'newspaper_issue'">
+                <f:if condition="{isNewspaper} == 'newspaper_issue'">
                     <!-- it's a newspaper! -->
-                  </f:if>
-                  <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:else>
-              </f:if>
+                </f:if>
+                <f:cObject typoscriptObjectPath="plugin.tx_dlf_pageview" />
+                <f:cObject typoscriptObjectPath="plugin.tx_dlf_audioplayer" />
+                <f:cObject typoscriptObjectPath="plugin.tx_dlf_view3d" />
+                <div class="fulltext-container"><div id="tx-dlf-fulltextselection"></div></div>
             </f:else>
           </f:if>
         </f:else>