From bbc48e75bf035f98270a28ea6dcb4c54b441605b Mon Sep 17 00:00:00 2001 From: squidfunk <martin.donath@squidfunk.com> Date: Thu, 2 Mar 2017 15:55:22 +0100 Subject: [PATCH] Fixed missing link in tabs navigation on deeply nested items --- material/partials/tabs-item.html | 28 ++++++++++++++---------- src/partials/tabs-item.html | 37 ++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/material/partials/tabs-item.html b/material/partials/tabs-item.html index aef42d77..686b5a59 100644 --- a/material/partials/tabs-item.html +++ b/material/partials/tabs-item.html @@ -11,15 +11,21 @@ {% endif %} </li> {% elif nav_item.children and nav_item.children | length > 0 %} - <li class="md-tabs__item"> - {% if nav_item.active %} - <a href="{{ (nav_item.children | first).url }}" title="{{ nav_item.title }}" class="md-tabs__link md-tabs__link--active"> - {{ nav_item.title }} - </a> - {% else %} - <a href="{{ (nav_item.children | first).url }}" title="{{ nav_item.title }}" class="md-tabs__link"> - {{ nav_item.title }} - </a> - {% endif %} - </li> + {% set title = title | default(nav_item.title) %} + {% if (nav_item.children | first).children | length > 0 %} + {% set nav_item = nav_item.children | first %} + {% include "partials/tabs-item.html" %} + {% else %} + <li class="md-tabs__item"> + {% if nav_item.active %} + <a href="{{ (nav_item.children | first).url }}" title="{{ title }}" class="md-tabs__link md-tabs__link--active"> + {{ title }} + </a> + {% else %} + <a href="{{ (nav_item.children | first).url }}" title="{{ title }}" class="md-tabs__link"> + {{ title }} + </a> + {% endif %} + </li> + {% endif %} {% endif %} diff --git a/src/partials/tabs-item.html b/src/partials/tabs-item.html index acfb04ed..60759edd 100644 --- a/src/partials/tabs-item.html +++ b/src/partials/tabs-item.html @@ -38,18 +38,27 @@ <!-- Main navigation item with nested items --> {% elif nav_item.children and nav_item.children | length > 0 %} - <li class="md-tabs__item"> - {% if nav_item.active %} - <a href="{{ (nav_item.children | first).url }}" - title="{{ nav_item.title }}" - class="md-tabs__link md-tabs__link--active"> - {{ nav_item.title }} - </a> - {% else %} - <a href="{{ (nav_item.children | first).url }}" - title="{{ nav_item.title }}" class="md-tabs__link"> - {{ nav_item.title }} - </a> - {% endif %} - </li> + {% set title = title | default(nav_item.title) %} + + <!-- Recurse, if the first item has nested items --> + {% if (nav_item.children | first).children | length > 0 %} + {% set nav_item = nav_item.children | first %} + {% include "partials/tabs-item.html" %} + + <!-- Render item --> + {% else %} + <li class="md-tabs__item"> + {% if nav_item.active %} + <a href="{{ (nav_item.children | first).url }}" + title="{{ title }}" class="md-tabs__link md-tabs__link--active"> + {{ title }} + </a> + {% else %} + <a href="{{ (nav_item.children | first).url }}" + title="{{ title }}" class="md-tabs__link"> + {{ title }} + </a> + {% endif %} + </li> + {% endif %} {% endif %} -- GitLab