Merge pull request #317 from beatrycze-volk/use-proper-constants

beatrycze-volk · web-flow · commit 316d6e73cc95 · 2024-11-08T17:00:13.000+01:00
[MAINTENANCE] Replace `config` with `plugin.tx_dfgviewer` in constants
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().id == {$config.kitodoPageView}]
+[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().id == {$config.rootPid}]
+[getTSFE().id == {$plugin.tx_dfgviewer.rootPid}]
 page.bodyTag = <body class="website home">
 [END]
 
-[getTSFE().id == {$config.kitodoPageView}]
+[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/Initialisation/data.xml b/Initialisation/data.xml
@@ -4194,9 +4194,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>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ page {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`
`28`		`-[getTSFE().id == {$config.kitodoPageView}]`
	`28`	`+[getTSFE().id == {$plugin.tx_dfgviewer.kitodoPageView}]`
`29`	`29`	`page {`
`30`	`30`	`includeCSS {`
`31`	`31`	`style = EXT:dfgviewer/Resources/Public/Css/allStyles.css`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugin.tx_news {`
`9`	`9`	`skipDefaultArguments = 0`
`10`	`10`	`}`
`11`	`11`	`settings {`
`12`		`- listPid = {$config.news.listPid}`
	`12`	`+ listPid = {$plugin.tx_dfgviewer.news.listPid}`
`13`	`13`	`displayDummyIfNoMedia = 0`
`14`	`14`	`analytics {`
`15`	`15`	`social {`
`@@ -18,7 +18,7 @@ plugin.tx_news {`
`18`	`18`	`twitter = 0`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`- startingpoint = {$config.news.storagePid}`
	`21`	`+ startingpoint = {$plugin.tx_dfgviewer.news.storagePid}`
`22`	`22`	`list {`
`23`	`23`	`media {`
`24`	`24`	`image {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ plugin.tx_dfgviewer_newspapercalendar {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`settings {`
`45`		`- targetPid = {$config.kitodoPageView}`
	`45`	`+ targetPid = {$plugin.tx_dfgviewer.kitodoPageView}`
`46`	`46`	`showEmptyMonths = 1`
`47`	`47`	`showEmptyTertialMonths = 0`
`48`	`48`	`}`