Merge remote-tracking branch 'origin/develop'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.0
+### Added
+* Positions of cookieconsent
+* Subcategorys for constants
+* Layouts of cookieconsent
+
 ## 1.1.0
 ### Added
 * Changelog.md

cookiebanner/Configuration/TypoScript/constants.typoscript

@@ -1,28 +1,51 @@
-# cat=cookiebanner : Advanced; type=string; label= Private Directory : Diractory for the Private Folder
-cookiebanner.privateDir = EXT:cookiebanner/Resources/Private
-# cat=cookiebanner : Advanced; type=string; label= Public Directory : Diractory for the Public Folder
-cookiebanner.publicDir = EXT:cookiebanner/Resources/Public
+################################
+#####                       ####
+#####  Custom Subcategorys  ####
+#####                       ####
+################################
+# customsubcategory=paths=Paths
+# customsubcategory=config=Config
+# customsubcategory=content=Content
+# customsubcategory=design=Design
+# customsubcategory=colors=Colors
 
-# cat=cookiebanner : Advanced; type=boolean; label= CSS Force Top : Force the CSS to be Top
-cookiebanner.cssTop = 1
-# cat=cookiebanner : Advanced; type=boolean; label= JavaScript Force Top : Force the JavaScript to be Top
-cookiebanner.jsTop = 1
+################################
+#####                       ####
+#####       Constants       ####
+#####                       ####
+################################
+cookiebanner{
+    # cat=cookiebanner:Advanced/paths; type=string; label= Private Directory : Diractory for the Private Folder
+    privateDir = EXT:cookiebanner/Resources/Private
+    # cat=cookiebanner:Advanced/paths; type=string; label= Public Directory : Diractory for the Public Folder
+    publicDir = EXT:cookiebanner/Resources/Public
 
-# cat=cookiebanner; type=string; label= Banner-Text : Change the text of banner
-cookiebanner.bannerText = Diese Webseite verwendet Cookies, um die Bedienfreundlichkeit zu erhöhen
-# cat=cookiebanner; type=string; label= Dismiss-Text : Change the text of Dismiss Button
-cookiebanner.dismissText = OK
-# cat=cookiebanner; type=string; label= ReadMore-Text : Change the text of the Readmore
-cookiebanner.moreText = Mehr lesen
-# cat=cookiebanner; type=string; label= ReadMore-Link : Change the Link of the Readmore
-cookiebanner.moreLink = https://www.jseidl.at/datenschutz
+    # cat=cookiebanner:Advanced/config; type=boolean; label= CSS Force Top : Force the CSS to be Top
+    cssTop = 1
+    # cat=cookiebanner:Advanced/config; type=boolean; label= JavaScript Force Top : Force the JavaScript to be Top
+    jsTop = 1
 
-# cat=cookiebanner; type=string; label= Color-Button-Text : The Button Text Color
-cookiebanner.colorTextButton = #780c0d
-# cat=cookiebanner; type=string; label= Color-Button Background : Change the Button Background color
-cookiebanner.colorButton = #ffffff
+    # cat=cookiebanner/content; type=string; label= Banner-Text : Change the text of banner
+    bannerText = Diese Webseite verwendet Cookies, um die Bedienfreundlichkeit zu erhöhen
+    # cat=cookiebanner/content; type=string; label= Dismiss-Text : Change the text of Dismiss Button
+    dismissText = OK
+    # cat=cookiebanner/content; type=string; label= ReadMore-Text : Change the text of the Readmore
+    moreText = Mehr lesen
+    # cat=cookiebanner/content; type=string; label= ReadMore-Link : Change the Link of the Readmore
+    moreLink = https://www.jseidl.at/datenschutz
 
-# cat=cookiebanner; type=string; label= Color Text : Change the color of the Text
-cookiebanner.colorText = #ffffff
-# cat=cookiebanner; type=string; label= Color Background : Change the color of the Background
-cookiebanner.colorBG = #780c0d
+    # cat=cookiebanner/design; type=options[Bottom=bottom,Top=top,Left=left,Right=right]; label= Position : Position of the banner
+    bannerPosition = bottom
+    # cat=cookiebanner/design; type=options[Block=block,Classic=classic,Edgeless=edgeless]; label= Layout : Change the layout of the banner
+    bannerLayout = block
+
+    # cat=cookiebanner/colors; type=string; label= Color-Button-Text : The Button Text Color
+    colorTextButton = #780c0d
+    # cat=cookiebanner/colors; type=string; label= Color-Button Background : Change the Button Background color
+    colorButton = #ffffff
+
+    # cat=cookiebanner/colors; type=string; label= Color Text : Change the color of the Text
+    colorText = #ffffff
+    # cat=cookiebanner/colors; type=string; label= Color Background : Change the color of the Background
+    colorBG = #780c0d
+}

cookiebanner/Configuration/TypoScript/setup.typoscript

@@ -12,6 +12,6 @@ page {
 
     footerData.14338 = TEXT
     footerData.14338.value (
-        <script>window.addEventListener("load",function(){window.cookieconsent.initialise({palette:{popup:{background:"{$cookiebanner.colorBG}",text:"{$cookiebanner.colorText}"},button:{background:"{$cookiebanner.colorButton}",text:"{$cookiebanner.colorTextButton}"}},content:{message:"{$cookiebanner.bannerText}",dismiss:"{$cookiebanner.dismissText}",link:"{$cookiebanner.moreText}",href:"{$cookiebanner.moreLink}"}})});</script>
+        <script>window.addEventListener("load",function(){window.cookieconsent.initialise({palette:{popup:{background:"{$cookiebanner.colorBG}",text:"{$cookiebanner.colorText}"},button:{background:"{$cookiebanner.colorButton}",text:"{$cookiebanner.colorTextButton}"}},content:{message:"{$cookiebanner.bannerText}",dismiss:"{$cookiebanner.dismissText}",link:"{$cookiebanner.moreText}",href:"{$cookiebanner.moreLink}"},position:"{$cookiebanner.bannerPosition}",theme:"{$cookiebanner.bannerLayout}"})});</script>
     )
 }

cookiebanner/ext_emconf.php

@@ -10,7 +10,7 @@
     'uploadfolder' => '0',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '1.1.0',
+    'version' => '1.2.0',
     'constraints' => [
         'depends' => [
             'typo3' => '8.7.0-8.7.99',