Fix incorrect nesting of tags, replace vhs menu viewhelper

This commit is contained in:
Björn Fromme
2021-12-20 16:54:02 +01:00
parent 8c0bb1238e
commit 078b917252
3 changed files with 105 additions and 107 deletions
@@ -129,6 +129,15 @@ page {
titleField = title
as = mobilenav
}
70 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
70 {
special = directory
special.value = {$plugin.tx_eptheme.settings.footerNavPid}
levels = 2
expandAll = 1
titleField = title
as = footernav
}
}
settings < plugin.tx_eptheme.settings
}
@@ -1,6 +1,5 @@
<html data-namespace-typo3-fluid="true" lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="bg-ep-primary-dark sbw:bg-sbw-primary-80 uch:bg-uch-primary-80 mt-8">
@@ -9,40 +8,29 @@
</f:if>
<div class="py-4 relative">
<div class="container grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8 pb-4">
<v:menu pageUid="{settings.footerNavPid}" levels="2" expandAll="true">
<f:for each="{menu}" as="menuheader" iteration="iteration">
<div data-controller="collapse"
data-collapse-until-value="991">
<span class="headline--4 text-white hidden md:block">
{menuheader.title}
</span>
<button type="button"
class="headline--4 text-white md:hidden"
data-action="collapse#toggle">
{menuheader.title}
</button>
<v:menu pageUid="{menuheader.uid}" useShortcutUid="true" as="submenu">
<ul class="list-disc text-white mb-0 pl-4"
data-collapse-target="container">
<f:for each="{submenu}" as="submenuitem">
<f:if condition="{submenuitem.doktype} == 3">
<f:then>
<li>
<a class="text-white" href="{submenuitem.url}" target="_blank" title="{submenuitem.linktext}">{submenuitem.title}</a>
</li>
</f:then>
<f:else>
<li>
<a class="text-white" href="{f:uri.typolink(parameter: submenuitem.uid)}" title="{submenuitem.linktext}">{submenuitem.title}</a>
</li>
</f:else>
</f:if>
</f:for>
</ul>
</v:menu>
</div>
</f:for>
</v:menu>
<f:for each="{footernav}" as="menuheader">
<div data-controller="collapse"
data-collapse-until-value="991">
<span class="headline--4 text-white hidden md:block">
{menuheader.title}
</span>
<button type="button"
class="headline--4 text-white md:hidden"
data-action="collapse#toggle">
{menuheader.title}
</button>
<f:if condition="{menuheader.children}">
<ul class="list-disc text-white mb-0 pl-4"
data-collapse-target="container">
<f:for each="{menuheader.children}" as="submenuitem">
<li>
<a class="text-white" href="{submenuitem.link}"{f:if(condition: '{submenuitem.doktype} == 3', then: ' target="_blank"')} title="{submenuitem.linktext}">{submenuitem.title}</a>
</li>
</f:for>
</ul>
</f:if>
</div>
</f:for>
</div>
<div class="hidden md:block container border-t border-white pt-4">
<div class="grid grid-cols-2 gap-16">
@@ -98,85 +86,87 @@
</div>
</div>
</div>
</div>
<div class="bg-ep-primary-dark sbw:bg-sbw-primary-dark pt-4 pb-16 md:py-4 text-sm lg:text-base text-white">
<div class="container">
<div class="grid grid-cols-1 md:grid-cols-12 gap-4">
<div class="md:col-span-4 text-center md:text-left">
© E&amp;P Reisen und Events GmbH
</div>
<div class="md:col-span-3 text-center md:text-left">
<ul class="p-0 m-0">
<li>
<a href="{f:uri.typolink(parameter: settings.legalNoticePageUid)}"
class="text-white"
title="Impressum">
Impressum
<div class="bg-ep-primary-dark sbw:bg-sbw-primary-dark pt-4 pb-16 md:py-4 text-sm lg:text-base text-white">
<div class="container">
<div class="grid grid-cols-1 md:grid-cols-12 gap-4">
<div class="md:col-span-4 text-center md:text-left">
© E&amp;P Reisen und Events GmbH
</div>
<div class="md:col-span-3 text-center md:text-left">
<ul class="p-0 m-0">
<li>
<a href="{f:uri.typolink(parameter: settings.legalNoticePageUid)}"
class="text-white"
title="Impressum">
Impressum
</a>
</li>
<li>
<a href="{f:uri.typolink(parameter: settings.termsAndConditionsPageUid)}"
class="text-white"
title="AGB">
AGB
</a>
</li>
<li>
<a href="{f:uri.typolink(parameter: settings.dataProtectionPageUid)}"
class="text-white"
title="AGB">
Datenschutz
</a>
</li>
<li>
<a href="#"
class="text-white"
onclick="cookiefirst_show_settings(); return false">
Cookie-Einstellungen
</a>
</li>
</ul>
</div>
<div class="md:col-span-3 text-center md:text-left">
<div class="inline-flex md:flex items-start space-x-2">
<a href="{settings.facebookUrl}"
title="E&amp;P bei Facebook"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-facebook"></use>
</svg>
</a>
</li>
<li>
<a href="{f:uri.typolink(parameter: settings.termsAndConditionsPageUid)}"
class="text-white"
title="AGB">
AGB
<a href="{settings.instagramUrl}"
title="E&amp;P bei Instagram"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-instagram"></use>
</svg>
</a>
</li>
<li>
<a href="{f:uri.typolink(parameter: settings.dataProtectionPageUid)}"
class="text-white"
title="AGB">
Datenschutz
<a href="{settings.youtubeUrl}"
title="E&amp;P bei YouTube"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-youtube"></use>
</svg>
</a>
</li>
<li>
<a href="#"
class="text-white"
onclick="cookiefirst_show_settings(); return false">
Cookie-Einstellungen
</a>
</li>
</ul>
</div>
<div class="md:col-span-3 text-center md:text-left">
<div class="inline-flex md:flex items-start space-x-2">
<a href="{settings.facebookUrl}"
title="E&amp;P bei Facebook"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-facebook"></use>
</svg>
</a>
<a href="{settings.instagramUrl}"
title="E&amp;P bei Instagram"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-instagram"></use>
</svg>
</a>
<a href="{settings.youtubeUrl}"
title="E&amp;P bei YouTube"
rel="nofollow"
target="_blank">
<svg class="w-6 h-6 text-white">
<use href="#icon-youtube"></use>
</svg>
</div>
</div>
<div class="md:col-span-2">
<a class="block bg-white p-2 w-24 mx-auto rounded"
href="https://www.unglobalcompact.org/"
target="_blank"
title="Global Compact">
<img class="w-full h-auto lazyload"
data-src="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/global_compact.png')}"
alt="Global Compact"/>
</a>
</div>
</div>
<div class="md:col-span-2">
<a class="block bg-white p-2 w-24 mx-auto rounded"
href="https://www.unglobalcompact.org/"
target="_blank"
title="Global Compact">
<img class="w-full h-auto lazyload"
data-src="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/global_compact.png')}"
alt="Global Compact"/>
</a>
</div>
</div>
</div>
<button type="button"
data-controller="scroll-top"
data-action="scroll-top#scroll"
@@ -1,6 +1,5 @@
<html data-namespace-typo3-fluid="true" lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">