Merge branch 'feature/accept-all'

Configuration/TypoScript/constants.txt

@@ -17,7 +17,7 @@ plugin.tx_cookieconsent {
         position = bottom-right
         # cat=plugin.cookieconsent; type=int+; label= dismiss on scroll (in PX)
         dismissOnScroll =
-        # cat=plugin.cookieconsent; type=options[info,opt-out]; label = Type
+        # cat=plugin.cookieconsent; type=options[info,opt-out,opt-in]; label = Type
         type = info
         # cat=plugin.cookieconsent; type=options[basic,dpextend]; label = extend layout with checkboxes
         layout = basic

Configuration/TypoScript/setup.txt

@@ -1,77 +1,111 @@
-page {
-    headerData {
-        998 = FLUIDTEMPLATE
-        998 {
-            file = EXT:dp_cookieconsent/Resources/Private/Layouts/Cookie.html
+# ==============================================
+# FE-Plugin configuration for EXT:dp_cookieconsent
+# ==============================================
+plugin.dp_cookieconsent {
+    view {
+        templateRootPaths {
+            0 = EXT:dp_cookieconsent/Resources/Private/Templates/
+            1 = {$plugin.tx_cookieconsent.view.templateRootPath}
+        }
+         partialRootPath {
+            0 = EXT:dp_cookieconsent/Resources/Private/Partials/
+            1 = {$plugin.tx_cookieconsent.view.partialRootPath}
+        }
+        layoutRootPath {
+            0 = EXT:dp_cookieconsent/Resources/Private/Layouts/
+            1 = {$plugin.tx_cookieconsent.view.layoutRootPath}
+        }
+    }
 
-            templateRootPath {
-                0 = EXT:dp_cookieconsent/Resources/Private/Templates/
-                1 = {$plugin.tx_cookieconsent.view.templateRootPath}
-            }
-            partialRootPath {
-                0 = EXT:dp_cookieconsent/Resources/Private/Partials/
-                1 = {$plugin.tx_cookieconsent.view.partialRootPath}
-            }
-            layoutRootPath {
-                0 = EXT:dp_cookieconsent/Resources/Private/Layouts/
-                1 = {$plugin.tx_cookieconsent.view.layoutRootPath}
-            }
+    settings {
+        url = {$plugin.tx_cookieconsent.settings.url}
 
-            settings  {
-                url = {$plugin.tx_cookieconsent.settings.url}
-                theme = {$plugin.tx_cookieconsent.settings.theme}
-                position = {$plugin.tx_cookieconsent.settings.position}
-                type = {$plugin.tx_cookieconsent.settings.type}
-                dismissOnScroll = {$plugin.tx_cookieconsent.settings.dismissOnScroll}
-                barBg = {$plugin.tx_cookieconsent.settings.palette.popup.background}
-                barColor = {$plugin.tx_cookieconsent.settings.palette.popup.text}
-                btnBg = {$plugin.tx_cookieconsent.settings.palette.button.background}
-                btnColor = {$plugin.tx_cookieconsent.settings.palette.button.text}
-                layout = {$plugin.tx_cookieconsent.settings.layout}
-                revokable = {$plugin.tx_cookieconsent.settings.revokable}
-                statistics = {$plugin.tx_cookieconsent.settings.statistics}
-                marketing = {$plugin.tx_cookieconsent.settings.marketing}
+        theme = {$plugin.tx_cookieconsent.settings.theme}
+        position = {$plugin.tx_cookieconsent.settings.position}
+        dismissOnScroll = {$plugin.tx_cookieconsent.settings.dismissOnScroll}
+        type = {$plugin.tx_cookieconsent.settings.type}
+        layout = {$plugin.tx_cookieconsent.settings.layout}
+        revokable = {$plugin.tx_cookieconsent.settings.revokable}
 
-                # Overlay def
-                overlay = {$plugin.tx_cookieconsent.settings.overlay.notice}
-                overlayBG = {$plugin.tx_cookieconsent.settings.overlay.box.background}
-                overlayText = {$plugin.tx_cookieconsent.settings.overlay.box.text}
+        checkboxes {
+            statistics = {$plugin.tx_cookieconsent.settings.statistics}
+            marketing = {$plugin.tx_cookieconsent.settings.marketing}
+        }
 
-                overlayBtnBG = {$plugin.tx_cookieconsent.settings.overlay.button.background}
-                overlayBtnText = {$plugin.tx_cookieconsent.settings.overlay.button.text}
+        overlay {
+            notice = {$plugin.tx_cookieconsent.settings.overlay.notice}
+            box {
+                background = {$plugin.tx_cookieconsent.settings.overlay.box.background}
+                text = {$plugin.tx_cookieconsent.settings.overlay.box.text}
+            }
+            button {
+                background = {$plugin.tx_cookieconsent.settings.overlay.button.background}
+                text = {$plugin.tx_cookieconsent.settings.overlay.button.text}
             }
         }
-    }
-}
 
-# Modify Google Analytics from CS_SEO
-page.headerData.657.10 {
-    stdWrap.replacement  {
-        10 {
-            search = <script
-            replace = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain"
-        }
-        20 {
-            search = src=
-            replace = data-src=
+        palette {
+            popup {
+                background = {$plugin.tx_cookieconsent.settings.palette.popup.background}
+                text = {$plugin.tx_cookieconsent.settings.palette.popup.text}
+            }
+            button {
+                background = {$plugin.tx_cookieconsent.settings.palette.button.background}
+                text = {$plugin.tx_cookieconsent.settings.palette.button.text}
+            }
         }
     }
 }
-# Modify Google Analytics from CS_SEO
-page.headerData.657.20 {
-    stdWrap.replacement  {
-        10 {
-            search = <script
-            replace = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain"
+
+lib.dp_cookieconsent = FLUIDTEMPLATE
+lib.dp_cookieconsent {
+    file = EXT:dp_cookieconsent/Resources/Private/Layouts/Cookie.html
+
+    templateRootPaths =< plugin.dp_cookieconsent.view.templateRootPaths
+    partialRootPath =< plugin.dp_cookieconsent.view.partialRootPath
+    layoutRootPath =< plugin.dp_cookieconsent.view.layoutRootPath
+
+    settings < plugin.dp_cookieconsent.settings
+}
+
+page {
+    headerData {
+        998 =< lib.dp_cookieconsent
+
+        # cs_seo hook
+        657 {
+            # Modify Google Analytics from CS_SEO
+            10 {
+                stdWrap.replacement  {
+                    10 {
+                        search = <script
+                        replace = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain"
+                    }
+                    20 {
+                        search = src=
+                        replace = data-src=
+                    }
+                }
+            }
+            # Modify Google Analytics from CS_SEO
+            20 {
+                stdWrap.replacement  {
+                    10 {
+                        search = <script
+                        replace = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain"
+                    }
+                }
+            }
+        }
+        # Modify Google Tag-Manager & Piwiki from CS_SEO
+        90 = COA
+        90 {
+            wrap = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain">|</script>
+
+            10 < page.jsInline.654
         }
     }
 }
-# Modify Google Tag-Manager & Piwiki from CS_SEO
-page.headerData.90 = COA
-page.headerData.90 {
-    wrap = <script data-ignore="1" data-cookieconsent="statistics" type="text/plain">|</script>
 
-    10 < page.jsInline.654
-}
 # Remove Original Google Tag-Manager & Piwiki from CS_SEO
 page.jsInline.654 >

Documentation/constant.md

@@ -0,0 +1,55 @@
+```typoscript
+plugin.tx_cookieconsent.settings {
+    # PID to Data Protection
+    url =
+    # Layout
+    theme = edgeless
+    # Position
+    position = bottom-right
+    # dismiss on scroll (in PX)
+    dismissOnScroll =
+    # Type (info, opt-out, opt-in)
+    type = opt-in
+    # extend layout with checkboxes (basic,dpextend)
+    layout = dpextend
+    #  pre check statistics in checkboxes layout
+    statistics = true
+    # pre check statistics in checkboxes layout
+    marketing = false
+
+    # show Iframe overlay
+    overlay {
+        # Enable Iframe overlay
+        notice = true
+
+        box {
+            # Overlay: Background
+            background = rgba(0,0,0,.8)
+            # Overlay: Text
+            text = #fff
+        }
+        button {
+            # Overlay Button: Background
+            background = #b81839
+            # Overlay Button: Text
+            text = #fff
+        }
+    }
+
+    # Cookiehint Style
+    palette {
+        popup {
+            # Bar: Background color
+            background = #2473be
+            # Bar: text color
+            text = #fff
+        }
+        button {
+            # Button: Background color
+            background = #f96332
+            # Button: text color
+            text = #fff
+        }
+    }
+}
+```

Documentation/translation.md

@@ -0,0 +1,21 @@
+```typoscript
+plugin.tx_dp_cookieconsent._LOCAL_LANG {
+    de {
+        message = XXX
+        dismiss = XXX
+        link = XXX
+        deny = XXX
+        allowall = XXX
+
+        # Checkbox labels
+        dpRequire = XXX
+        dpStatistik = XXX
+        dpMarketing = XXX
+
+        # Iframe Overlay text
+        media.notice = XXX
+        media.desc = XXX
+        media.btn = XXX
+    }
+}
+```