From 5f674392ce6d8587e97e8fc5e3a9935fb900217a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 16 Apr 2024 12:49:31 +0200
Subject: [PATCH] feat: optional dedicated link to apply to logo image

---
 .../Configuration/TypoScript/constants.typoscript         | 2 ++
 .../ep_theme/Configuration/TypoScript/setup.typoscript    | 1 +
 .../ext/ep_theme/Resources/Private/Partials/Mainnav.html  | 8 ++++----
 .../ep_theme/Resources/Private/Partials/Mobilenav.html    | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
index a5d148fd..3ed857b3 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
@@ -22,6 +22,8 @@ plugin.tx_eptheme {
 		footerNavPid =
 		# cat=eptheme/200/130; type=string; label=Default homepage UID
 		defaultHomeUid =
+		# cat=eptheme/200/135; type=string; label=Link to apply to logo (overrides defaultHomeUid)
+		logoLink =
 		# cat=eptheme/200/140; type=string; label=Default page UID for ajax requests
 		defaultAjaxUid =
 		# cat=eptheme/200/150; type=string; label=Default contact form 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 12462ac5..969f8348 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
@@ -30,6 +30,7 @@ plugin.tx_eptheme {
         teaserTextMaxChars = {$plugin.tx_eptheme.settings.teaserTextMaxChars}
         faqPageUid = {$plugin.tx_eptheme.settings.faqPageUid}
         defaultHomeUid = {$plugin.tx_eptheme.settings.defaultHomeUid}
+        logoLink = {$plugin.tx_eptheme.settings.logoLink}
         defaultAjaxUid = {$plugin.tx_eptheme.settings.defaultAjaxUid}
         defaultContactFormPageUid = {$plugin.tx_eptheme.settings.defaultContactFormPageUid}
         defaultSearchPageUid = {$plugin.tx_epproducts.settings.defaultSearchPageUid}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
index 72166437..c151ce47 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
@@ -6,13 +6,13 @@
     <f:section name="Main">
         <div class="fixed top-0 left-0 inset-x-0 z-40 lg:relative lg:container bg-white shadow-md lg:shadow-none">
             <div class="flex items-center hover-hover:lg:items-end justify-between px-4 py-2 lg:px-0 lg:pt-4 lg:pb-0">
-                <a href="{f:uri.typolink(parameter: settings.defaultHomeUid)}"
-                   class="block lg:pb-4"
-                   title="{settings.defaultTitle}">
+                <f:link.typolink parameter="{f:if(condition: settings.logoLink, then: settings.logoLink, else: settings.defaultHomeUid)}"
+                                 class="block lg:pb-4"
+                                 title="{settings.defaultTitle}">
                     <f:image src="{settings.logoImage}"
                              class="block w-auto {ep:themeClasses(classes: '{ep: \'h-10 lg:h-12\', sbw: \'h-14 lg:h-24\', snz: \'h-14 lg:h-24\', suz: \'h-14 lg:h-24\', uch: \'h-12 lg:h-20\', ser: \'h-10 lg:h-12\'}', key: settings.themekey)}"
                              alt="{settings.defaultTitle}"/>
-                </a>
+                </f:link.typolink>
                 <div class="hidden hover-hover:lg:block">
                     <f:render section="FirstLevel" arguments="{_all}"/>
                 </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
index b158ab64..7eba5279 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
@@ -11,11 +11,11 @@
              data-overlay-toggle-target="overlay"
              data-action="overlay-toggle:toggle@window->overlay-toggle#toggle">
             <div class="fixed top-0 left-0 z-100 inset-x-0 px-4 py-2 hover-none:lg:py-4 flex justify-between bg-white shadow-md">
-                <a href="{f:uri.typolink(parameter: settings.defaultHomeUid)}"
-                   class="block hover-hover:lg:pb-4"
-                   title="{settings.defaultTitle}">
+                <f:link.typolink parameter="{f:if(condition: settings.logoLink, then: settings.logoLink, else: settings.defaultHomeUid)}"
+                                 class="block hover-hover:lg:pb-4"
+                                 title="{settings.defaultTitle}">
                     <f:image class="block h-10 lg:h-12 w-auto" src="{settings.logoImage}" alt="{settings.defaultTitle}"/>
-                </a>
+                </f:link.typolink>
                 <div class="flex hover-hover:lg:hidden items-center space-x-4">
                     <f:if condition="{data.tx_eptheme_hide_searchbar}">
                         <f:else>