1 files changed, 21 insertions, 35 deletions
diff --git a/pelican-themes/gum/templates/sidebar.html b/pelican-themes/gum/templates/sidebar.html
index 25b22e4..288b1b2 100644
--- a/pelican-themes/gum/templates/sidebar.html
+++ b/pelican-themes/gum/templates/sidebar.html
@@ -1,42 +1,7 @@
 <div class="three columns">
 
-<h4>Pages</h4>
 
- <ul>
-  {% for title, link in MENUITEMS %}
-      <li><a href="{{ link }}">{{ title }}</a></li>
-  {% endfor %}
-  {% if DISPLAY_PAGES_ON_MENU %}
-    {% for p in PAGES %}
-      <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-    {% endfor %}
-  {% else %}
-    {% if DISPLAY_CATEGORIES_ON_MENU %}
-      {% for cat, null in categories %}
-        <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
-      {% endfor %}
-    {% endif %}
-  {% endif %}
-  </ul>
 
-<h4>Categories</h4>
-{% if categories %}
-<ul>
-	{% for cat, null in categories %}
-		<li><a href="{{ SITEURL }}/{{ cat.url|e }}">{{ cat }}</a></li>
-	{% endfor %}
-</ul>
-{% endif %}
-
-
-<h4>Tags</h4>
-{% if tags %}
-	<ul>
-	{% for tag in tag_cloud %}
-	    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0|e }}</a></li>
-	{% endfor %}
-</ul>
-{% endif %}
 
 
 {% if SOCIAL %}
@@ -50,4 +15,25 @@
 </nav>
 {% endif %}
 
+<h4>Links</h4>
+
+ <ul>
+{% for title, link in LINKS %}
+    <li><a href="{{ link }}">{{ title }}</a></li>
+{% endfor %}
+</ul>
+<h4>Tags</h4>
+<ul class="tagcloud">
+    {% for tag in tag_cloud %}
+        <li class="tag-{{ tag.1 }}">
+            <a href="{{ SITEURL }}/{{ tag.0.url }}">
+            {{ tag.0 }}
+                {% if TAG_CLOUD_BADGE %}
+                    <span class="badge">{{ tag.2 }}</span>
+                {% endif %}
+            </a>
+        </li>
+    {% endfor %}
+</ul>
+
 </div>