From 6f69371d24a3dac47a44427db15b58f51e3200f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 21 Apr 2018 09:25:25 +0200 Subject: [PATCH] Fix possible js issues with cookieconsent lib --- .../Configuration/TypoScript/Page/Main.ts | 34 +++++++++++++++++-- .../Private/Layouts/Page/Detail.html | 1 - .../Private/Layouts/Page/Frontpage.html | 1 - .../Private/Layouts/Page/FrontpageEvent.html | 1 - .../Private/Layouts/Page/Search.html | 1 - .../Private/Layouts/Page/Subpage.html | 1 - .../Layouts/Page/SubpageSidebarLeft.html | 1 - .../Layouts/Page/SubpageSidebarLeftEvent.html | 1 - .../Layouts/Page/SubpageSidebarRight.html | 1 - .../Page/SubpageSidebarRightEvent.html | 1 - .../Private/Partials/CookieConsent.html | 22 ------------ 11 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Partials/CookieConsent.html diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts index 26cdeef8..3b684653 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts @@ -13,6 +13,10 @@ page { shortcutIcon = EXT:ep_theme/Resources/Public/images/favicon_ep.ico + includeCSS { + main = EXT:ep_theme/Resources/Public/css/main.css + } + includeJSFooterlibs { manifest = EXT:ep_theme/Resources/Public/js/manifest.js vendor = EXT:ep_theme/Resources/Public/js/vendor.js @@ -26,8 +30,34 @@ page { main = EXT:ep_theme/Resources/Public/js/main.js } - includeCSS { - main = EXT:ep_theme/Resources/Public/css/main.css + 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 diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html index 785263f4..7e9c1ec6 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html @@ -19,5 +19,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html index a10df648..70b5972d 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html @@ -19,5 +19,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html index ddd0f1b4..c719448b 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html @@ -15,5 +15,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html index 417a7091..ac87432e 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html @@ -13,5 +13,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html index 4e00acd3..1d0e0569 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html @@ -21,5 +21,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html index cca75887..a48d8bd6 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html @@ -34,5 +34,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html index d961ca58..4a1cbbf5 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html @@ -26,5 +26,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html index a364fc4b..b0079b99 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html @@ -36,5 +36,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html index 6517f7eb..fc826800 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html @@ -26,5 +26,4 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/CookieConsent.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/CookieConsent.html deleted file mode 100644 index 395bd235..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/CookieConsent.html +++ /dev/null @@ -1,22 +0,0 @@ -