Merge pull request #5 from Keats/v0.4

Update theme to gutenberg 0.4

README.md

@@ -30,6 +30,19 @@ paginate_by = 5
 
 The posts should therefore be in directly under the `content` folder.
 
+The theme requires tags and categories taxonomies to be enabled in your `config.toml`:
+
+```toml
+taxonomies = [
+    # You can enable/disable RSS
+    {name = "categories", rss = true},
+    {name = "tags", rss = true},
+]
+```
+If you want to paginate taxonomies pages, you will need to overwrite the templates
+as it only works for non-paginated taxonomies by default.
+
+
 ## Options
 
 ### Top-menu

config.toml

@@ -3,8 +3,10 @@ compile_sass = true
 title = "after-dark theme"
 description = ""
 
-generate_tags_pages = true
-generate_categories_pages = true
+taxonomies = [
+    {name = "categories", rss = true},
+    {name = "tags", rss = true},
+]
 
 [extra]
 author = "Vincent"

content/some-article.md

@@ -1,7 +1,9 @@
 +++
 title = "What is Gutenberg"
 date = 2017-09-24
-category = "Hello world"
+
+[taxonomies]
+categories = ["Hello world"]
 +++
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc eu feugiat sapien. Aenean ligula nunc, laoreet id sem in, interdum bibendum felis. Donec vel dui neque. Praesent ac sem ut justo volutpat rutrum a imperdiet tellus. Nam lobortis massa non hendrerit hendrerit. Vivamus porttitor dignissim turpis, eget aliquam urna tincidunt non. Aliquam et fringilla turpis. Nullam eros est, eleifend in ornare sed, hendrerit eget est. Aliquam tellus felis, suscipit vitae ex vel, fringilla tempus massa. Nulla facilisi. Pellentesque lobortis consequat lectus. Maecenas ac libero elit.

content/some-other-article.md

@@ -2,6 +2,8 @@
 title = "A first theme for Gutenberg"
 date = 2017-09-25
 category = "Prog"
+
+[taxonomies]
 tags = ["rust", "ssg", "other"]
 +++
 

templates/categories/list.html

@@ -7,11 +7,11 @@
 
     <h1>Categories</h1>
 
-    {% if categories %}
+    {% if terms %}
         <ul>
-            {% for category in categories %}
+            {% for term in terms %}
                 <li>
-                    <a href="{{ category.permalink }}">{{ category.name }}</a>({{ category.pages | length }})
+                    <a href="{{ term.permalink }}">{{ term.name }}</a>({{ term.pages | length }})
                 </li>
             {% endfor %}
         </ul>

templates/categories/single.html

@@ -6,9 +6,9 @@
         {{ super() }}
     {% endblock header %}
 
-    <h1>{{ category.name }}</h1>
+    <h1>{{ term.name }}</h1>
 
-    {% for page in category.pages %}
+    {% for page in term.pages %}
         {{ post_macros::page_in_list(page=page) }}
     {% endfor %}
 {% endblock content %}

templates/page.html

@@ -19,16 +19,17 @@
                 {% if config.extra.author %}
                     Published by {{ config.extra.author }}
                 {% endif %}
-                {% if page.category %}
-                    in <a href="{{ get_taxonomy_url(kind="category", name=page.category) }}">{{ page.category }}</a>
+                {% if page.taxonomies.categories %}
+                    {% set category = page.taxonomies.categories[0] %}
+                    in <a href="{{ get_taxonomy_url(kind="categories", name=category) }}">{{ category }}</a>
                 {% endif %}
-                {% if page.tags %}
+                {% if page.taxonomies.tags %}
                     and tagged
-                    {% for tag in page.tags %}
-                        <a href="{{ get_taxonomy_url(kind="tag", name=tag) }}">{{ tag }}</a>
-                        {% if page.tags | length > 1 %}
-                            {% if loop.index != page.tags | length %}
-                                {% if loop.index == page.tags | length - 1 %}
+                    {% for tag in page.taxonomies.tags %}
+                        <a href="{{ get_taxonomy_url(kind="tags", name=tag) }}">{{ tag }}</a>
+                        {% if page.taxonomies.tags | length > 1 %}
+                            {% if loop.index != page.taxonomies.tags | length %}
+                                {% if loop.index == page.taxonomies.tags | length - 1 %}
                                     and
                                 {% else %}
                                     ,

templates/tags/list.html

@@ -7,10 +7,10 @@
 
     <h1>Tags</h1>
 
-    {% if tags %}
+    {% if terms %}
         <ul>
-            {% for tag in tags %}
-                <li><a href="{{ tag.permalink }}">{{ tag.name }}</a> ({{ tag.pages | length }})</li>
+            {% for term in terms %}
+                <li><a href="{{ term.permalink }}">{{ term.name }}</a> ({{ term.pages | length }})</li>
             {% endfor %}
         </ul>
     {% endif %}

templates/tags/single.html

@@ -5,9 +5,9 @@
         {{ super() }}
     {% endblock header %}
 
-    <h1>{{ tag.name }}</h1>
+    <h1>{{ term.name }}</h1>
 
-    {% for page in tag.pages %}
+    {% for page in term.pages %}
         {{ post_macros::page_in_list(page=page) }}
     {% endfor %}
 {% endblock content %}

theme.toml

@@ -2,7 +2,7 @@ name = "after-dark"
 description = "A robust, elegant dark theme"
 license = "MIT"
 homepage = "https://github.com/Keats/after-dark"
-min_version = "0.2"
+min_version = "0.4.0"
 
 [extra]
 
@@ -13,5 +13,5 @@ homepage = "https://vincent.is"
 
 [original]
 author =  "comfusion"
-homepage = "https://comfusion.github.io/after-dark/"
-repo = "https://github.com/comfusion/after-dark"
+homepage = "https://git.habd.as/comfusion/after-dark/"
+repo = "https://git.habd.as/comfusion/after-dark/"