From f010714d358f72d5f4e2514ee8b885f7f058db95 Mon Sep 17 00:00:00 2001
From: Joseph Nix <nixjdm@terminallabs.com>
Date: Sat, 15 Dec 2018 12:14:42 -0600
Subject: [PATCH] [lektor-website-197] Fixing url pathing of plugin tags with
 upper case letters.

---
 Website.lektorproject      | 3 ++-
 configs/tags.ini           | 1 +
 templates/plugin-tags.html | 4 ++--
 templates/plugin.html      | 2 +-
 templates/plugins.html     | 7 +++++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Website.lektorproject b/Website.lektorproject
index f6f43cb0..13079808 100644
--- a/Website.lektorproject
+++ b/Website.lektorproject
@@ -16,4 +16,5 @@ lektor-markdown-header-anchors = 0.1
 lektor-markdown-highlighter = 0.1
 lektor-markdown-admonition = 0.1
 lektor-atom = 0.2
-lektor-tags = 0.1
+lektor-tags = 0.3
+lektor-slugify = 0.4
diff --git a/configs/tags.ini b/configs/tags.ini
index a6260ff6..2c090ee4 100644
--- a/configs/tags.ini
+++ b/configs/tags.ini
@@ -1,2 +1,3 @@
 parent = /plugins
 template = plugin-tag.html
+url_path = {{ this.parent.url_path }}tag/{{ tag|slug(lowercase=False) }}
diff --git a/templates/plugin-tags.html b/templates/plugin-tags.html
index 3d0d23a0..96d0a328 100644
--- a/templates/plugin-tags.html
+++ b/templates/plugin-tags.html
@@ -9,12 +9,12 @@
   </p>
   <div class="row">
 
-    {% set tags = this.parent.children.distinct("tags")|rejectattr("tags") %}
+    {% set tags = this.parent.children.distinct("tags") %}
     {% for column in tags|sort|slice(3) %}
       <div class="col-md-4 child">
         <ul>
           {% for tag in column %}
-            <li><a href="{{ ('/plugins/tag/' ~ tag.lower() ~ '/')|url }}">{{ tag }}</a></li>
+            <li><a href="{{ ('/plugins@tag/' ~ tag ~ '/')|url }}">{{ tag }}</a></li>
           {% endfor %}
         </ul>
       </div>
diff --git a/templates/plugin.html b/templates/plugin.html
index 904a0dcc..7b4b00b9 100644
--- a/templates/plugin.html
+++ b/templates/plugin.html
@@ -63,7 +63,7 @@
         {% if this.tags %}
           {% for t in this.tags|sort %}
             {{ "and " if loop.last }}
-            <a href="{{ ('/plugins/tag/' ~ t.lower() ~ '/')|url }}">{{ t }}</a>{{ ", " if not loop.last }}
+            <a href="{{ ('/plugins@tag/' ~ t ~ '/')|url }}">{{ t }}</a>{{ ", " if not loop.last }}
           {% endfor %}
         {% else %}
           <p>Plugin has no tags.</p>
diff --git a/templates/plugins.html b/templates/plugins.html
index 83c489f4..53f9ce3f 100644
--- a/templates/plugins.html
+++ b/templates/plugins.html
@@ -21,4 +21,11 @@
       {{ render_plugin_list(category.children) }}
     </div>
   {% endfor %}
+
+  <h2>Tags</h2>
+  <p>
+    Plugins are also tagged with keywords and topics.
+    Their tags are listed on their page and are navigable.
+    You can view a list of all of the tags <a href="/plugins/tags">here</a>.
+  </p>
 {% endblock %}