2 files changed, 21 insertions, 7 deletions
diff --git a/sneakyidea/templates/base.html b/sneakyidea/templates/base.html
index 1ec6fe5..d280c04 100644
--- a/sneakyidea/templates/base.html
+++ b/sneakyidea/templates/base.html
@@ -27,16 +27,18 @@
         <header id="banner" class="body">
                 <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
-                {% for title, link in MENUITEMS %}
-                    <li><a href="{{ link }}">{{ title }}</a></li>
-                {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU %}
-                {% for page in PAGES %}
-                    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
-                {% endfor %}
+                    {% for current_page in PAGES %}
+                        <li {% if page %}{% if page == current_page%}class="active"{% endif %}{% endif %}>
+                            <a href="{{ SITEURL }}/pages/{{ current_page.url }}">{{ current_page.title }}</a>
+                        </li>
+                    {% endfor %}
                 {% endif %}
                 {% for cat, null in categories %}
-                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                    <li {% if cat == category and not article %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                {% endfor %}
+                {% for title, link in MENUITEMS %}
+                    <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
                 {% endfor %}
                 </ul></nav>
         </header><!-- /#banner -->
diff --git a/sneakyidea/templates/tags.html b/sneakyidea/templates/tags.html
index e69de29..3a5db00 100644
--- a/sneakyidea/templates/tags.html
+++ b/sneakyidea/templates/tags.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% block title %}Tags{% endblock %}
+{% block content %}
+<section id="content" class="body">
+    <h1 class="entry-title">Tags</h1>
+    <ul id="cloud">
+        {% for tag in tag_cloud %}
+            <li class="tag-{{ tag.1 }}"><a href="/tag/{{ tag.0 }}/">{{ tag.0 }}</a></li>
+        {% endfor %}
+    </ul>
+</section>
+{% endblock %}