From 2c17acf6285852f365f7ec36f7e83c70201b6fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 7 Oct 2020 09:02:49 +0200 Subject: [PATCH 1/3] Add footer links --- .../TypoScript/constants.typoscript | 2 ++ .../Configuration/TypoScript/setup.typoscript | 1 + .../Resources/Private/Partials/Footer.html | 18 +++++++++++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript index 4f112056..0471090f 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript @@ -30,6 +30,8 @@ plugin.tx_eptheme { termsAndConditionsPageUid = # cat=eptheme/200/180; type=string; label=Data protection page UID dataProtectionPageUid = + # cat=eptheme/200/185; type=string; label=Image credits page UID + imageCreditsPageUid = # cat=eptheme/200/190; type=string; label=Cookie policy page UID cookiePolicyPageUid = # cat=eptheme/200/200; type=string; label=FAQ page UID diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript index 6264e988..6d737da2 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript @@ -36,6 +36,7 @@ plugin.tx_eptheme { legalNoticePageUid = {$plugin.tx_eptheme.settings.legalNoticePageUid} termsAndConditionsPageUid = {$plugin.tx_eptheme.settings.termsAndConditionsPageUid} dataProtectionPageUid = {$plugin.tx_eptheme.settings.dataProtectionPageUid} + imageCreditsPageUid = {$plugin.tx_eptheme.settings.imageCreditsPageUid} cookiePolicyPageUid = {$plugin.tx_eptheme.settings.cookiePolicyPageUid} infoPageUid = {$plugin.tx_eptheme.settings.infoPageUid} groupsPageUid = {$plugin.tx_eptheme.settings.groupsPageUid} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html index b69cb28d..88bd68b8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html @@ -64,13 +64,17 @@ -
+
-
© E&P Reisen und Events GmbH
+
© E&P Reisen und Events GmbH
- Impressum - AGB +
-
- - Global Compact +
+ + Global Compact
From a10b3498f449d821cbc25acba9a87dd4ae12c5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 7 Oct 2020 09:05:11 +0200 Subject: [PATCH 2/3] Apply rte styles to product detail page --- .../Resources/Private/Partials/Product/Details.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html index b4970e31..7b2af3f9 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html @@ -1,5 +1,5 @@
Konzept
-
+
{product.conceptDescription -> f:format.html()}
@@ -8,24 +8,24 @@
Verpflegung
-
+
{product.boardDescription -> f:format.html()}
Zusatzleistungen
-
+
{product.additionalServices -> f:format.html()}
Programm
-
+
{product.programmeDescription -> f:format.html()}
Skipass, Kurse, Leihmaterial
-
+
{product.skiPassDescription -> f:format.html()}
From 54813f94a9de6afef9a476962efbff647e773f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 7 Oct 2020 09:06:18 +0200 Subject: [PATCH 3/3] Update project dependencies --- composer.lock | 84 +++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index 6a4cdc1a..fa89453a 100644 --- a/composer.lock +++ b/composer.lock @@ -2198,7 +2198,7 @@ }, { "name": "symfony/asset", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", @@ -2269,16 +2269,16 @@ }, { "name": "symfony/cache", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "72b4c2bfe8b40a0d7365943cfaaf1658217e2f69" + "reference": "292cd57b7c2e3c37aa2f0a2fa42dacae567dd5cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/72b4c2bfe8b40a0d7365943cfaaf1658217e2f69", - "reference": "72b4c2bfe8b40a0d7365943cfaaf1658217e2f69", + "url": "https://api.github.com/repos/symfony/cache/zipball/292cd57b7c2e3c37aa2f0a2fa42dacae567dd5cd", + "reference": "292cd57b7c2e3c37aa2f0a2fa42dacae567dd5cd", "shasum": "" }, "require": { @@ -2359,7 +2359,7 @@ "type": "tidelift" } ], - "time": "2020-09-24T07:56:38+00:00" + "time": "2020-09-27T14:02:37+00:00" }, { "name": "symfony/cache-contracts", @@ -2439,7 +2439,7 @@ }, { "name": "symfony/console", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -2594,7 +2594,7 @@ }, { "name": "symfony/expression-language", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", @@ -2659,16 +2659,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "5ef0f6c609c1a36f723880dfe78301199bc96868" + "reference": "60d08560f9aa72997c44077c40d47aa28a963230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/5ef0f6c609c1a36f723880dfe78301199bc96868", - "reference": "5ef0f6c609c1a36f723880dfe78301199bc96868", + "url": "https://api.github.com/repos/symfony/finder/zipball/60d08560f9aa72997c44077c40d47aa28a963230", + "reference": "60d08560f9aa72997c44077c40d47aa28a963230", "shasum": "" }, "require": { @@ -2718,20 +2718,20 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:08:58+00:00" + "time": "2020-10-02T07:34:48+00:00" }, { "name": "symfony/http-client", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "00a61220bb0439ce71d48d375b15be7a23f9ea98" + "reference": "b1cb966898aaf8df37280fde537a27b6724b3bc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/00a61220bb0439ce71d48d375b15be7a23f9ea98", - "reference": "00a61220bb0439ce71d48d375b15be7a23f9ea98", + "url": "https://api.github.com/repos/symfony/http-client/zipball/b1cb966898aaf8df37280fde537a27b6724b3bc4", + "reference": "b1cb966898aaf8df37280fde537a27b6724b3bc4", "shasum": "" }, "require": { @@ -2800,7 +2800,7 @@ "type": "tidelift" } ], - "time": "2020-09-24T13:25:24+00:00" + "time": "2020-10-02T13:41:48+00:00" }, { "name": "symfony/http-client-contracts", @@ -2879,16 +2879,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6cca6b2e4b69fc5bace160d14cf1ee5f71483db4" + "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6cca6b2e4b69fc5bace160d14cf1ee5f71483db4", - "reference": "6cca6b2e4b69fc5bace160d14cf1ee5f71483db4", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/353b42e7b4fd1c898aab09a059466c9cea74039b", + "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b", "shasum": "" }, "require": { @@ -2950,11 +2950,11 @@ "type": "tidelift" } ], - "time": "2020-09-13T05:01:27+00:00" + "time": "2020-09-27T14:14:57+00:00" }, { "name": "symfony/inflector", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -3027,7 +3027,7 @@ }, { "name": "symfony/intl", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", @@ -3117,7 +3117,7 @@ }, { "name": "symfony/options-resolver", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -3964,7 +3964,7 @@ }, { "name": "symfony/process", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -4027,7 +4027,7 @@ }, { "name": "symfony/property-access", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", @@ -4108,16 +4108,16 @@ }, { "name": "symfony/routing", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8db77d97152f55f0df5158cc0a877ad8e16099ac" + "reference": "006b2d06672b8650998f328fc603eb6f3feb979f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8db77d97152f55f0df5158cc0a877ad8e16099ac", - "reference": "8db77d97152f55f0df5158cc0a877ad8e16099ac", + "url": "https://api.github.com/repos/symfony/routing/zipball/006b2d06672b8650998f328fc603eb6f3feb979f", + "reference": "006b2d06672b8650998f328fc603eb6f3feb979f", "shasum": "" }, "require": { @@ -4194,20 +4194,20 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:08:58+00:00" + "time": "2020-10-01T16:25:17+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "c4bc95bf668be70d57eec904ac222fb4b694e73e" + "reference": "8e97a9cfc5a48de83437f286d6d0ab4a2a2c22b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/c4bc95bf668be70d57eec904ac222fb4b694e73e", - "reference": "c4bc95bf668be70d57eec904ac222fb4b694e73e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/8e97a9cfc5a48de83437f286d6d0ab4a2a2c22b0", + "reference": "8e97a9cfc5a48de83437f286d6d0ab4a2a2c22b0", "shasum": "" }, "require": { @@ -4290,7 +4290,7 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:08:58+00:00" + "time": "2020-10-02T20:12:42+00:00" }, { "name": "symfony/service-contracts", @@ -4370,7 +4370,7 @@ }, { "name": "symfony/string", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", @@ -4455,7 +4455,7 @@ }, { "name": "symfony/var-exporter", - "version": "v5.1.6", + "version": "v5.1.7", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", @@ -4530,7 +4530,7 @@ }, { "name": "symfony/web-link", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/web-link.git", @@ -4620,7 +4620,7 @@ }, { "name": "symfony/yaml", - "version": "v4.4.14", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git",