From: Vladimír Vondruš <mosra@centrum.cz>
Date: Thu, 7 Dec 2017 10:21:58 +0000 (+0100)
Subject: theme: make the top navbar markup a bit more compact.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=f327cafe5dc153ee4d5980222521f2628e6fd04a;p=blog.git

theme: make the top navbar markup a bit more compact.
---

diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index 2376e832..6078e60c 100644
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -33,31 +33,35 @@
         <div class="m-row">
           <ol class="m-col-t-6 m-col-m-none">
             {% for title, link, slug, sub in M_LINKS_NAVBAR1 %}
+            {% if not sub %}
+            <li><a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+            {% else %}
             <li>
               <a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
-              {% if sub %}
               <ol>
                 {% for title, link, slug in sub %}
                 <li><a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
                 {% endfor %}
               </ol>
-              {% endif %}
             </li>
+            {% endif %}
             {% endfor %}
           </ol>
           {% set start = M_LINKS_NAVBAR1|length + 1 %}
           <ol class="m-col-t-6 m-col-m-none" start="{{ start }}">
             {% for title, link, slug, sub in M_LINKS_NAVBAR2 %}
+            {% if not sub %}
+            <li><a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+            {% else %}
             <li>
               <a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
-              {% if sub %}
               <ol>
                 {% for title, link, slug in sub %}
                 <li><a href="{{ link|format_siteurl }}"{% if (page and page.highlight == slug) or slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
                 {% endfor %}
               </ol>
-              {% endif %}
             </li>
+            {% endif %}
             {% endfor %}
           </ol>
         </div>