Merge branch 'master' into update-typo12

slub · Nov 14, 2024 · 22b4c8d · 22b4c8d
2 parents a75f40f + 0341726
commit 22b4c8d
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/Configuration/TypoScript/Navigation/menu.typoscript b/Configuration/TypoScript/Navigation/menu.typoscript
@@ -80,7 +80,7 @@ lib.menu {
     20 = HMENU
     20 {
         special = directory
-        special.value = {$config.headNavPid}
+        special.value = {$plugin.tx_dfgviewer.headNavPid}
         1 = TMENU
         1 {
           expAll = 1
@@ -99,7 +99,7 @@ lib.menu {
     20 = HMENU
     20 {
         special = list
-        special.value = {$config.viewerNavPids}
+        special.value = {$plugin.tx_dfgviewer.viewerNavPids}
         1 = TMENU
         1 {
           expAll = 1

diff --git a/Configuration/TypoScript/Page/header.typoscript b/Configuration/TypoScript/Page/header.typoscript
@@ -25,7 +25,7 @@ page {
 }
 
 
-[getTSFE() && getTSFE().id == {$config.kitodoPageView}]
+[getTSFE() && getTSFE().id == {$plugin.tx_dfgviewer.kitodoPageView}]
 page {
   includeCSS {
     style = EXT:dfgviewer/Resources/Public/Css/allStyles.css

diff --git a/Configuration/TypoScript/Page/page.typoscript b/Configuration/TypoScript/Page/page.typoscript
@@ -27,25 +27,25 @@ page {
       pageTitle.data = page:title
 
       productName = TEXT
-      productName.value = {$config.productName}
+      productName.value = {$plugin.tx_dfgviewer.productName}
 
       pageHideInMenu = TEXT
       pageHideInMenu.data = page:nav_hide
 
       rootPageId = TEXT
-      rootPageId.value = {$config.rootPid}
+      rootPageId.value = {$plugin.tx_dfgviewer.rootPid}
 
       kitodoPageView = TEXT
-      kitodoPageView.value = {$config.kitodoPageView}
+      kitodoPageView.value = {$plugin.tx_dfgviewer.kitodoPageView}
 
       piwik_hostname = TEXT
-      piwik_hostname.value = {$config.piwik_hostname}
+      piwik_hostname.value = {$plugin.tx_dfgviewer.piwik_hostname}
 
       piwik_idsite = TEXT
-      piwik_idsite.value = {$config.piwik_idsite}
+      piwik_idsite.value = {$plugin.tx_dfgviewer.piwik_idsite}
 
       piwik_domains = TEXT
-      piwik_domains.value = {$config.piwik_domains}
+      piwik_domains.value = {$plugin.tx_dfgviewer.piwik_domains}
 
     }
   }
@@ -60,11 +60,11 @@ lib.parseFunc_RTE.nonTypoTagStdWrap.encapsLines.nonWrappedTag >
 # -------------------------------
 # Diverses
 # -------------------------------
-[getTSFE() && getTSFE().id == {$config.rootPid}]
+[getTSFE() && getTSFE().id == {$plugin.tx_dfgviewer.rootPid}]
 page.bodyTag = <body class="website home">
 [END]
 
-[getTSFE() && getTSFE().id == {$config.kitodoPageView}]
+[getTSFE() && getTSFE().id == {$plugin.tx_dfgviewer.kitodoPageView}]
 page {
   bodyTag = <body class="dfgviewer">
   10 {

diff --git a/Configuration/TypoScript/Plugins/News/changelog.typoscript b/Configuration/TypoScript/Plugins/News/changelog.typoscript
@@ -9,7 +9,7 @@ plugin.tx_news {
         skipDefaultArguments = 0
     }
     settings {
-        listPid = {$config.news.listPid}
+        listPid = {$plugin.tx_dfgviewer.news.listPid}
         displayDummyIfNoMedia = 0
         analytics {
             social {
@@ -18,7 +18,7 @@ plugin.tx_news {
                 twitter = 0
             }
         }
-        startingpoint = {$config.news.storagePid}
+        startingpoint = {$plugin.tx_dfgviewer.news.storagePid}
         list {
             media {
                 image {

diff --git a/Configuration/TypoScript/Plugins/News/faq.typoscript b/Configuration/TypoScript/Plugins/News/faq.typoscript
@@ -9,7 +9,7 @@ plugin.tx_news {
         skipDefaultArguments = 0
     }
     settings {
-        listPid = {$config.news.listPid}
+        listPid = {$plugin.tx_dfgviewer.news.listPid}
         displayDummyIfNoMedia = 0
         analytics {
             social {
@@ -18,7 +18,7 @@ plugin.tx_news {
                 twitter = 0
             }
         }
-        startingpoint = {$config.news.storagePid}
+        startingpoint = {$plugin.tx_dfgviewer.news.storagePid}
         list {
             media {
                 image {

diff --git a/Configuration/TypoScript/Plugins/dfgviewer.typoscript b/Configuration/TypoScript/Plugins/dfgviewer.typoscript
@@ -42,7 +42,7 @@ plugin.tx_dfgviewer_newspapercalendar {
         }
     }
     settings {
-        targetPid = {$config.kitodoPageView}
+        targetPid = {$plugin.tx_dfgviewer.kitodoPageView}
         showEmptyMonths = 1
         showEmptyTertialMonths = 0
     }

diff --git a/Configuration/TypoScript/Plugins/kitodo.typoscript b/Configuration/TypoScript/Plugins/kitodo.typoscript
@@ -79,7 +79,7 @@ plugin.tx_dlf_embedded3dviewer {
 plugin.tx_dlf_pagegrid < tt_content.list.20.dlf_pagegrid
 plugin.tx_dlf_pagegrid {
     settings {
-        targetPid = {$config.kitodoPageView}
+        targetPid = {$plugin.tx_dfgviewer.kitodoPageView}
         placeholder = EXT:dfgviewer/Resources/Public/Images/GridPlaceHolder.jpg
         paginate {
             itemsPerPage = 24
@@ -100,7 +100,7 @@ plugin.tx_dlf_pagegrid {
 plugin.tx_dlf_tableofcontents < tt_content.list.20.dlf_tableofcontents
 plugin.tx_dlf_tableofcontents {
     settings {
-        targetPid = {$config.kitodoPageView}
+        targetPid = {$plugin.tx_dfgviewer.kitodoPageView}
         menuConf {
             expAll = 1
         }

diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
@@ -1,18 +1,15 @@
-config {
+plugin.tx_dfgviewer {
 
-    # cat=plugin.tx_dfgviewer/links/010; type=int+; label=Storage PID
-    storagePid =
-
-    # cat=plugin.tx_dfgviewer/links/020; type=int+; label=Root PID
+    # cat=plugin.tx_dfgviewer/links/010; type=int+; label=Root PID
     rootPid =
 
-    # cat=plugin.tx_dfgviewer/links/030; type=int+; label= Headnavigation PID
+    # cat=plugin.tx_dfgviewer/links/020; type=int+; label= Headnavigation PID
     headNavPid =
 
-    # cat=plugin.tx_dfgviewer/links/040; type=string; label= Multiple IDs for the sidebar navigation in the viewer
+    # cat=plugin.tx_dfgviewer/links/030; type=string; label= Multiple IDs for the sidebar navigation in the viewer
     viewerNavPids =
 
-    # cat=plugin.tx_dfgviewer/links/050; type=int+; label=Kitodo Page View
+    # cat=plugin.tx_dfgviewer/links/040; type=int+; label=Kitodo Page View
     kitodoPageView =
 
     # cat=plugin.tx_dfgviewer/piwik/010; type=string; label=Piwik Hostname

diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -44,7 +44,9 @@ To install a fresh TYPO3 12.4 system, try the following installation procedure w
     # remove /var/www/dfgviewer if it already exist or make sure it's really empty by ls -la dfgviewer/
     rm -r dfgviewer/
     # load full TYPO3 via composer
+
     composer create-project typo3/cms-base-distribution:^12 dfgviewer
+
     # Install the TYPO3 system with the TYPO3-console
     cd dfgviewer/
     ./vendor/bin/typo3 setup
@@ -85,6 +87,7 @@ You can set this easily with the TYPO3-console::
     ./vendor/bin/typo3 configuration:set 'FE/pageNotFoundOnCHashError' 0
 
 Now you have a working TYPO3 12.4 LTS installation and you can continue with composer
+
 to install DFG-Viewer extension.
 
 

diff --git a/Initialisation/data.xml b/Initialisation/data.xml
@@ -4082,9 +4082,9 @@
 				<field index="include_static_file">EXT:fluid_styled_content/Configuration/TypoScript/,EXT:dlf/Configuration/TypoScript/,EXT:dfgviewer/Configuration/TypoScript</field>
 				<field index="constants"># Please set at least the following constants via the TypoScript Constant Editor
 plugin.tx_dlf.persistence.storagePid = 3
-config.rootPid = 1
-config.headNavPid = 0
-config.kitodoPageView = 2</field>
+plugin.tx_dfgviewer.rootPid = 1
+plugin.tx_dfgviewer.headNavPid = 0
+plugin.tx_dfgviewer.kitodoPageView = 2</field>
 				<field index="config"></field>
 				<field index="nextLevel"></field>
 				<field index="basedOn"></field>