diff --git a/package-lock.json b/package-lock.json index bcc3ebf0..af9f08c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "axios-auth-refresh": "^1.0.7", "bootstrap-sass": "^3.4.1", "bourbon": "^4.3.2", - "cookieconsent": "^3.1.0", "cooltipz-css": "^1.6.8", "dayjs": "^1.10.6", "es6-slide-up-down": "^1.0.0", @@ -3544,11 +3543,6 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "node_modules/cookieconsent": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz", - "integrity": "sha512-v8JWLJcI7Zs9NWrs8hiVldVtm3EBF70TJI231vxn6YToBGj0c9dvdnYwltydkAnrbBMOM/qX1xLFrnTfm5wTag==" - }, "node_modules/cooltipz-css": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/cooltipz-css/-/cooltipz-css-1.7.1.tgz", @@ -13891,11 +13885,6 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "cookieconsent": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz", - "integrity": "sha512-v8JWLJcI7Zs9NWrs8hiVldVtm3EBF70TJI231vxn6YToBGj0c9dvdnYwltydkAnrbBMOM/qX1xLFrnTfm5wTag==" - }, "cooltipz-css": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/cooltipz-css/-/cooltipz-css-1.7.1.tgz", diff --git a/package.json b/package.json index 52e1d30c..3a57cc94 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "axios-auth-refresh": "^1.0.7", "bootstrap-sass": "^3.4.1", "bourbon": "^4.3.2", - "cookieconsent": "^3.1.0", "cooltipz-css": "^1.6.8", "dayjs": "^1.10.6", "es6-slide-up-down": "^1.0.0", diff --git a/public/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript b/public/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript index d50c0c3e..0fa41c7f 100644 --- a/public/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript +++ b/public/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript @@ -21,35 +21,6 @@ page { main = typo3_encore:EpEventsConfig:main } - jsFooterInline { - 10 = TEXT - 10.typolink.parameter = {$plugin.tx_epevents.settings.dataProtectionPageUid} - 10.typolink.returnLast = url - 10.typolink.forceAbsoluteUrl = 1 - 10.wrap ( - window.addEventListener("load", function (){ - window.cookieconsent.initialise({ - "palette": { - "popup": { - "background": "#ffffff", - "text": "#1e314b" - }, - "button": { - "background": "#19a0d2", - "text": "#ffffff" - } - }, - "content": { - "message": "Wir verwenden Cookies. Durch die Benutzung unserer Website akzeptieren Sie unsere Richtlinien.", - "dismiss": "Cookies akzeptieren", - "link": "Mehr Infos", - "href": "|" - } - }) - }); - ) - } - 10 = FLUIDTEMPLATE 10 { file { @@ -59,6 +30,8 @@ page { override { data = TSFE:page|backend_layout } + + ifEmpty = Default split { token = pagets__ @@ -101,32 +74,8 @@ page { } headerData.999 = TEXT - headerData.999.value ( - - - - ) - headerData.999.stdWrap.if.isTrue = {$plugin.tx_epevents.settings.googleTagManagerId} - headerData.9999 = TEXT - headerData.9999.value ( - - - - ) + headerData.999.wrap = + headerData.999.value = {$plugin.tx_epevents.settings.cookieFirstKey} } [page["doktype"] == 101] diff --git a/public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript index 4c462e1e..99fb1b03 100644 --- a/public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript +++ b/public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript @@ -40,8 +40,8 @@ plugin.tx_epevents { xmlSitemapRootPageUid = # cat=plugin.tx_epevents//a; type=string; label=XML sitemap page UIDs to exclude xmlSitemapExcludeUids = - # cat=plugin.tx_epevents//a; type=string; label=Google Tag Manager ID - googleTagManagerId = + # cat=plugin.tx_epevents//a; type=string; label=Cookiefirst key + cookieFirstKey = # cat=plugin.tx_epevents//a; type=string; label=Ignore following IPs in searchlog searchLogIgnoreIps = # cat=plugin.tx_epevents//a; type=string; label=Activity default header image diff --git a/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript index 10999968..8bf05b96 100644 --- a/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript +++ b/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript @@ -30,7 +30,7 @@ plugin.tx_epevents { inquiryToName = {$plugin.tx_epevents.settings.inquiryToName} xmlSitemapRootPageUid = {$plugin.tx_epevents.settings.xmlSitemapRootPageUid} xmlSitemapExcludeUids = {$plugin.tx_epevents.settings.xmlSitemapExcludeUids} - googleTagManagerId = {$plugin.tx_epevents.settings.googleTagManagerId} + cookieFirstKey = {$plugin.tx_epevents.settings.cookieFirstKey} offerDetailPageUid = {$plugin.tx_epevents.settings.offerDetailPageUid} activityDetailPageUid = {$plugin.tx_epevents.settings.activityDetailPageUid} activityListPageUid = {$plugin.tx_epevents.settings.activityListPageUid} diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/js/_app.js b/public/typo3conf/ext/ep_events/Resources/Private/Assets/js/_app.js index 5b738280..cc057f56 100644 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/js/_app.js +++ b/public/typo3conf/ext/ep_events/Resources/Private/Assets/js/_app.js @@ -1,7 +1,5 @@ 'use strict'; -require('cookieconsent'); - import Vue from 'vue' import $ from 'jquery' import VueSession from 'vue-session' diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_cookieconsent.scss b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_cookieconsent.scss deleted file mode 100644 index d3f6a8c2..00000000 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_cookieconsent.scss +++ /dev/null @@ -1,3 +0,0 @@ -.cc-window { - font-size: 75%; -} diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/main.scss b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/main.scss index e2c3cce9..19102b6d 100644 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/main.scss +++ b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/main.scss @@ -33,7 +33,6 @@ $output-bourbon-deprecation-warnings: false; @import "teasers"; @import "badge"; @import "team"; -@import "cookieconsent"; @import "search"; @import "offerlist"; @import "paginator"; diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript index 0db7b90d..a640c57a 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript @@ -64,36 +64,6 @@ page { main = typo3_encore:EpThemeConfig:main } - jsFooterInline { - 10 = TEXT - 10.typolink.parameter = {$plugin.tx_eptheme.settings.dataProtectionPageUid} - 10.typolink.returnLast = url - 10.typolink.forceAbsoluteUrl = 1 - 10.wrap ( - window.addEventListener("load", function () { - window.cookieconsent.initialise({ - "palette": { - "popup": { - "background": "#006db6", - "text": "#ffffff" - }, - "button": { - "background": "#f9cb0d", - "text": "#ffffff" - } - }, - "dismissOnTimeout": 5000, - "content": { - "message": "Wir verwenden Cookies. Durch die Benutzung unserer Website akzeptierst Du unsere Richtlinien.", - "dismiss": "Cookies akzeptieren", - "link": "Mehr Infos", - "href": "|" - } - }) - }); - ) - } - 10 = FLUIDTEMPLATE 10 { file { @@ -164,14 +134,23 @@ page { } headerData.999 = TEXT - headerData.999.value ( - - - + headerData.999.wrap = + headerData.999.value = {$plugin.tx_eptheme.settings.cookieFirstKey} + + headerData.9999 = TEXT + headerData.9999.value ( + + + ) - headerData.999.stdWrap.if.isTrue = {$plugin.tx_eptheme.settings.googleTagManagerId} } diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript index f3196826..fcec04fb 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript @@ -137,8 +137,8 @@ plugin.tx_eptheme { # cat=eptheme/600/110; type=string; label=XML sitemap page UIDs to exclude xmlSitemapExcludeUids = - # cat=eptheme/300/100; type=string; label=Google Tag Manager ID - googleTagManagerId = + # cat=eptheme/300/100; type=string; label=Cookiefirst key + cookieFirstKey = fabb1554-8932-4075-85dc-97fa68892918 # cat=eptheme/300/110; type=string; label=Google Static Maps Base Url googleStaticMapsBaseUrl = https://maps.googleapis.com/maps/api/staticmap?key=AIzaSyDDOforD1O_j4xXy2nJybC2yQqbUAw9ClY # cat=eptheme/300/120; type=string; label=Google Maps Js API Url diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript index 71076f69..60d49d77 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript @@ -46,7 +46,7 @@ plugin.tx_eptheme { eventDisturberListitems = {$plugin.tx_eptheme.settings.eventDisturberListitems} eventDisturberButtonLabel = {$plugin.tx_eptheme.settings.eventDisturberButtonLabel} eventDisturberButtonLink = {$plugin.tx_eptheme.settings.eventDisturberButtonLink} - googleTagManagerId = {$plugin.tx_eptheme.settings.googleTagManagerId} + cookieFirstKey = {$plugin.tx_eptheme.settings.cookieFirstKey} bpnBookingUrlTemplateCode = {$plugin.tx_eptheme.settings.bpnBookingUrlTemplateCode} groupsPricePopupPageUid = {$plugin.tx_eptheme.settings.groupsPricePopupPageUid} googleStaticMapsBaseUrl = {$plugin.tx_eptheme.settings.googleStaticMapsBaseUrl} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js index 61b970af..97d47959 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js @@ -1,5 +1,4 @@ // Import dependencies -require('cookieconsent') require('lazysizes') require('lazysizes/plugins/unveilhooks/ls.unveilhooks') require('picturefill') diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss deleted file mode 100644 index 4d8c8925..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss +++ /dev/null @@ -1,18 +0,0 @@ -@import "~cookieconsent/build/cookieconsent.min.css"; - -.cc-window.cc-floating { - @apply p-8; -} - -.cc-message, -.cc-btn { - font-size: 75% !important; - - @screen sm { - font-size: 100% !important; - } -} - -.cc-link { - font-size: 100% !important; -} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss index 0be0b7e9..beadf7a4 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss @@ -17,7 +17,6 @@ @import "components/badges"; @import "components/buttons"; @import "components/contact-bar"; - @import "components/cookie-consent"; @import "components/calendar"; @import "components/datepicker"; @import "components/forms"; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html index 647514aa..2dfc497b 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html index 4add3b5e..5cc46e7d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html index e07eee75..9241ad9b 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html index 795fdd77..0f59e1f7 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html index c297ebc5..3f80b3ad 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html index c65cca4b..c7f5cfd7 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html index 1d85150d..a223d60a 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html index df6f1e9e..ab2510c7 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html index 519d0238..0d24681f 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - -