From 81e2fbf02f5c77729162b467ad87bc81a8d179ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 21 Apr 2018 09:37:12 +0200 Subject: [PATCH] Apply cookieconsent changes to epevents --- .../Configuration/TypoScript/Page/Main.ts | 37 ++++++++++++++++--- .../Configuration/TypoScript/setup.txt | 1 + .../Layouts/Page/ActivityEpEvents.html | 1 - .../Layouts/Page/CategoryEpEvents.html | 1 - .../Layouts/Page/FrontpageEpEvents.html | 1 - .../Private/Layouts/Page/OfferEpEvents.html | 1 - .../Private/Layouts/Page/SubpageEpEvents.html | 1 - 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts index ac88df61..7d448bdd 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts @@ -1,9 +1,5 @@ page = PAGE page { - config { - index_enable = 1 - } - meta { viewport = width=device-width, initial-scale=1, maximum-scale=1 X-UA-Compatible = ie=edge @@ -11,6 +7,10 @@ page { shortcutIcon = EXT:ep_events/Resources/Public/images/favicon.ico + includeCSS { + main = EXT:ep_events/Resources/Public/css/main.css + } + includeJS { remarketing = https://www.googleadservices.com/pagead/conversion_async.js remarketing.external = 1 @@ -21,8 +21,33 @@ page { main = EXT:ep_events/Resources/Public/js/main.js } - includeCSS { - main = EXT:ep_events/Resources/Public/css/main.css + 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 diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt index ec42a5f4..aa72a8fc 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt @@ -171,6 +171,7 @@ config { htmlTag_langKey = de compressJs = 1 compressCss = 1 + compressBody = 1 typolinkEnableLinksAcrossDomains = 1 } diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/ActivityEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/ActivityEpEvents.html index 32d868a5..ef314cb6 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/ActivityEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/ActivityEpEvents.html @@ -12,7 +12,6 @@ - diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html index 4a8025aa..0f681886 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html @@ -78,7 +78,6 @@ - diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/FrontpageEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/FrontpageEpEvents.html index 3ee821ec..b982a860 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/FrontpageEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/FrontpageEpEvents.html @@ -25,6 +25,5 @@ - diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/OfferEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/OfferEpEvents.html index 6fa5e0f7..1f516a4c 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/OfferEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/OfferEpEvents.html @@ -108,7 +108,6 @@ - diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html index bcec049a..152733f3 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html @@ -48,7 +48,6 @@ -