From: Vladimír Vondruš <mosra@centrum.cz>
Date: Tue, 19 Sep 2017 19:26:56 +0000 (+0200)
Subject: theme: highlight navbar items based on slug, not title.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=55be0d3a1f5921e6681186f2bb95928456938568;p=blog.git

theme: highlight navbar items based on slug, not title.

Because more than one subpage can (and usually does) have the same
title.
---

diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index ac9db964..a4302d45 100644
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -31,13 +31,13 @@
         <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
           <div class="m-row">
             <ol class="m-col-t-6 m-col-m-none">
-              {% for title, link, sub in LINKS_NAVBAR1 %}
+              {% for title, link, slug, sub in LINKS_NAVBAR1 %}
               <li>
-                <a href="{{ link }}"{% if title == page_title %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+                <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
                 {% if sub %}
                 <ol>
-                  {% for title, link in sub %}
-                  <li><a href="{{ link }}">{{ title }}</a></li>
+                  {% for title, link, slug in sub %}
+                  <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
                   {% endfor %}
                 </ol>
                 {% endif %}
@@ -45,13 +45,13 @@
               {% endfor %}
             </ol>
             <ol class="m-col-t-6 m-col-m-none">
-              {% for title, link, sub in LINKS_NAVBAR2 %}
+              {% for title, link, slug, sub in LINKS_NAVBAR2 %}
               <li>
-                <a href="{{ link }}"{% if title == page_title %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+                <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
                 {% if sub %}
                 <ol>
-                  {% for title, link in sub %}
-                  <li><a href="{{ link }}">{{ title }}</a></li>
+                  {% for title, link, slug in sub %}
+                  <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
                   {% endfor %}
                 </ol>
                 {% endif %}
diff --git a/pelican-theme/templates/base_blog.html b/pelican-theme/templates/base_blog.html
index b0500088..597c88d4 100644
--- a/pelican-theme/templates/base_blog.html
+++ b/pelican-theme/templates/base_blog.html
@@ -1,4 +1,4 @@
-{% set page_title = 'Blog' %}
+{% set page_slug = 'blog' %}
 {% extends 'base.html' %}
 
 {% block title %}{{ BLOGNAME }}{% endblock %}
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 2032cc5e..8701037b 100644
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -1,4 +1,4 @@
-{% set page_title = page.title %}
+{% set page_slug = page.slug %}
 {% extends "base.html" %}
 
 {% block title %}