Liquid template tidy-up

_includes/datasets_display.html

@@ -1,15 +1,7 @@
 
 {% comment %}Only display datasets in current category if there is a current category{% endcomment %}
 {% if current_category %}
-    {% assign current_slug = current_category | slugify %}
-    {% assign datasets = "" | split: "" %}
-    {% for s in site.datasets %}
-        {% capture slugs %}{% for category in s.categories %}{{category|slugify}}|{%endfor%}{%endcapture%}
-        {% assign site_slugs = slugs | split: "|" %}
-        {% if site_slugs contains current_slug %}
-            {% assign datasets = datasets | push: s %}
-        {% endif %}
-    {% endfor %}
+    {% assign datasets = site.datasets | where:"category", current_category %}
 {% else %}
     {% assign datasets = site.datasets %}
 {% endif %}
@@ -41,7 +33,7 @@ <h3>Categories</h3>
         {% endunless %}
       {% endfor %}
       <div class="js-hidden">
-      {% include filter-category.html categories=categories current=current_category  %}
+      {% include filter-category.html categories=categories current_category=current_category  %}
       </div>
       <div class="js-shown">
         <a href="#" class="list-group-item list-show-more">Show {{ categories | size | plus: 1 }} more...</a>

_includes/filter-category.html

@@ -1,6 +1,6 @@
 {% comment %}All the below is so the list is sorted in descending size order. Ozymandias had nothing.{% endcomment %}
 {% assign sizes = '' | split: "" %}
-{% assign current_slug = current_category | slugify %}
+{% assign current_slug = include.current_category | slugify %}
 {% for category in include.categories %}
   {% assign c = site.datasets | where:"category", category | size %}
   {% assign sizes = sizes | push: c %}
@@ -11,10 +11,10 @@
     {% assign c = sizes[forloop.index0] %}
     {% if c == s %}
       {% assign category_slug = category | slugify %}
-      <a href="/categories/{{ category | slugify }}" class="list-group-item {% if category_slug == current_slug %}active{% endif %}">
-        <span class="list-group-item-truncate">{{ category }}</span>
-        <span class="badge">{{ s }}</span>
-      </a>
+          <a href="/categories/{{ category | slugify }}" class="list-group-item {% if category_slug == current_slug %}active{% endif %}">
+            <span class="list-group-item-truncate">{{ category }}</span>
+            <span class="badge">{{ s }}</span>
+          </a>
     {% endif %}
   {% endfor %}
 {% endfor %}

_layouts/category.html

@@ -3,4 +3,4 @@
 ---
 
 {% assign current_category = page.name %}
-{% include datasets_display.html current_category=current_category %}
+{% include datasets_display.html %}