From 3b1a1a21921ab980728cb62f4e5413c17ae150e4 Mon Sep 17 00:00:00 2001
From: Marco Biedermann <marco.biedermann@gmx.de>
Date: Sat, 23 Dec 2017 10:35:30 +0100
Subject: [PATCH 1/3] wrap navigation into <nav> tag

---
 .../Private/Layouts/Page/Default.html.twig    | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
index ad57953..42e25d6 100644
--- a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
+++ b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
@@ -1,21 +1,23 @@
-<ul>
-    <f:for each="{mainnavigation}" as="mainnavigationItem">
-        <li class="{f:if(condition: mainnavigationItem.active, then:'active')}">
-            <a href="{mainnavigationItem.link}" target="{mainnavigationItem.target}" title="{mainnavigationItem.title}">
-                {mainnavigationItem.title}
-            </a>
-            <f:if condition="{mainnavigationItem.children}">
-                <ul>
-                    <f:for each="{mainnavigationItem.children}" as="child">
-                        <li class="{f:if(condition: child.active, then:'active')}">
-                            <a href="{child.link}" target="{child.target}" title="{child.title}">
-                                {child.title}
-                            </a>
-                        </li>
-                    </f:for>
-                </ul>
-            </f:if>
-        </li>
-    </f:for>
-</ul>
+<nav>
+    <ul>
+        <f:for each="{mainnavigation}" as="mainnavigationItem">
+            <li class="{f:if(condition: mainnavigationItem.active, then:'active')}">
+                <a href="{mainnavigationItem.link}" target="{mainnavigationItem.target}" title="{mainnavigationItem.title}">
+                    {mainnavigationItem.title}
+                </a>
+                <f:if condition="{mainnavigationItem.children}">
+                    <ul>
+                        <f:for each="{mainnavigationItem.children}" as="child">
+                            <li class="{f:if(condition: child.active, then:'active')}">
+                                <a href="{child.link}" target="{child.target}" title="{child.title}">
+                                    {child.title}
+                                </a>
+                            </li>
+                        </f:for>
+                    </ul>
+                </f:if>
+            </li>
+        </f:for>
+    </ul>
+</nav>
 <f:render section="Main" />

From 15c5efa079118e618e408f349227d0a67f89a28c Mon Sep 17 00:00:00 2001
From: Marco Biedermann <marco.biedermann@gmx.de>
Date: Sat, 23 Dec 2017 10:37:46 +0100
Subject: [PATCH 2/3] only render class attribute if set

---
 .../Resources/Private/Layouts/Page/Default.html.twig          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
index 42e25d6..fe1428b 100644
--- a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
+++ b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
@@ -1,14 +1,14 @@
 <nav>
     <ul>
         <f:for each="{mainnavigation}" as="mainnavigationItem">
-            <li class="{f:if(condition: mainnavigationItem.active, then:'active')}">
+            <li{f:if(condition: mainnavigationItem.active, then:' class="active"')}>
                 <a href="{mainnavigationItem.link}" target="{mainnavigationItem.target}" title="{mainnavigationItem.title}">
                     {mainnavigationItem.title}
                 </a>
                 <f:if condition="{mainnavigationItem.children}">
                     <ul>
                         <f:for each="{mainnavigationItem.children}" as="child">
-                            <li class="{f:if(condition: child.active, then:'active')}">
+                            <li{f:if(condition: child.active, then:' class="active')}>
                                 <a href="{child.link}" target="{child.target}" title="{child.title}">
                                     {child.title}
                                 </a>

From 6811f98ac1bff064f5667e9a900ef8d398e10f06 Mon Sep 17 00:00:00 2001
From: Marco Biedermann <marco.biedermann@gmx.de>
Date: Sat, 23 Dec 2017 10:38:22 +0100
Subject: [PATCH 3/3] only render target attribute if set

---
 .../Resources/Private/Layouts/Page/Default.html.twig          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
index fe1428b..8db9fc7 100644
--- a/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
+++ b/src/BK2K/Sitepackage/GeneratorBundle/Resources/skeletons/BaseExtension/fluid_styled_content/Resources/Private/Layouts/Page/Default.html.twig
@@ -2,14 +2,14 @@
     <ul>
         <f:for each="{mainnavigation}" as="mainnavigationItem">
             <li{f:if(condition: mainnavigationItem.active, then:' class="active"')}>
-                <a href="{mainnavigationItem.link}" target="{mainnavigationItem.target}" title="{mainnavigationItem.title}">
+                <a href="{mainnavigationItem.link}" title="{mainnavigationItem.title}"{f:if(condition: mainnavigationItem.target, then: ' target="{mainnavigationItem.target}"')}>
                     {mainnavigationItem.title}
                 </a>
                 <f:if condition="{mainnavigationItem.children}">
                     <ul>
                         <f:for each="{mainnavigationItem.children}" as="child">
                             <li{f:if(condition: child.active, then:' class="active')}>
-                                <a href="{child.link}" target="{child.target}" title="{child.title}">
+                                <a href="{child.link}" title="{child.title}"{f:if(condition: child.target, then: ' target="{child.target}"')}>
                                     {child.title}
                                 </a>
                             </li>