Browse Source

Merge pull request #27 from svanlaere/patch-1

Navigation: check if folder has content
trendschau 6 năm trước cách đây
mục cha
commit
1637640901

+ 4 - 2
themes/typemill/partials/navigation.twig

@@ -14,10 +14,12 @@
 			<li class="{{ element.elementType }} level-{{ depth }}">
 			<li class="{{ element.elementType }} level-{{ depth }}">
 		{% endif %}
 		{% endif %}
             {% if (element.elementType == 'folder') %}
             {% if (element.elementType == 'folder') %}
-				<a href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>		
+				<a href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>
+		{% if (element.folderContent|length > 0) %}	
                 <ul>
                 <ul>
                     {{ macros.loop_over(element.folderContent,chapnum) }}
                     {{ macros.loop_over(element.folderContent,chapnum) }}
                 </ul>
                 </ul>
+		{% endif %}
             {% else %}
             {% else %}
 				<a href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
 				<a href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
             {% endif %}
             {% endif %}
@@ -29,4 +31,4 @@
 
 
 <ul>
 <ul>
     {{ macros.loop_over(navigation,settings.themes.typemill.chapnum) }}
     {{ macros.loop_over(navigation,settings.themes.typemill.chapnum) }}
-</ul>
+</ul>