[TASK] Show navigation title in Fluid Styled Content Special Menus if set 28/45528/2
authorGianluigi Martino <gmartino27@gmail.com>
Mon, 28 Dec 2015 12:57:22 +0000 (13:57 +0100)
committerBenni Mack <benni@typo3.org>
Thu, 31 Dec 2015 11:42:01 +0000 (12:42 +0100)
Show navigation title if set, else show page title in Fluid Styled Content
Special Menus

Resolves: #72432
Releases: master, 7.6
Change-Id: I5ebcb7f6133759d6b238cf7ab4db99a14fa18157
Reviewed-on: https://review.typo3.org/45528
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Directory.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-0.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-1.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-2.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-4.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-5.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-6.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-7.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-8.html
typo3/sysext/fluid_styled_content/Resources/Private/Partials/Menu/Type-categorized_pages.html

index d90c459..8230bbf 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                        <f:render partial="Menu/Directory" arguments="{pageUids: {0: page.uid}}" />
                                </li>
index a935299..a8d26ef 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                        </f:for>
index 51afc77..a231f7c 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                        </f:for>
index 6013249..fc24b75 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                        <f:render partial="Menu/Directory" arguments="{pageUids: {0: page.uid}}" />
                                </li>
index c918202..019c8fc 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <dt>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </dt>
                                <dd>
index 94eec76..66ebdfb 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                        </f:for>
index 52e5d8c..ed96866 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                        </f:for>
index 3d2bc8c..fe51e44 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                                <ce:menu.section pageUid="{page.uid}" as="contentElements" type="header">
index 12986f8..17eac7f 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                        <f:render partial="Menu/Directory" arguments="{pageUids: {0: page.uid}}" />
                                </li>
index 8bdf843..b4a5e04 100644 (file)
@@ -5,7 +5,14 @@
                        <f:for each="{pages}" as="page">
                                <li>
                                        <f:link.page pageUid="{page.uid}">
-                                               {page.title}
+                                               <f:if condition="{page.nav_title}">
+                                                       <f:then>
+                                                               {page.nav_title}
+                                                       </f:then>
+                                                       <f:else>
+                                                               {page.title}
+                                                       </f:else>
+                                               </f:if>
                                        </f:link.page>
                                </li>
                        </f:for>