diff --git a/config.toml b/config.toml index ea92dfe..fc1d1aa 100644 --- a/config.toml +++ b/config.toml @@ -9,7 +9,6 @@ generate_rss = true taxonomies = [ {name = "blog/tags", rss = true}, - {name = "blog/categories", rss = true} ] [extra] @@ -20,7 +19,6 @@ name = "Blog" url = "/blog" sub = [ {name = "Latest", url = "/blog"}, - {name = "Categories", url = "/blog/categories"}, {name = "Tags", url = "/blog/tags"} ] diff --git a/content/blog/hello-world.md b/content/blog/hello-world.md index 0b6e00f..97a6b7a 100644 --- a/content/blog/hello-world.md +++ b/content/blog/hello-world.md @@ -3,8 +3,7 @@ title = "Hello World" date = 2018-08-22 [taxonomies] -"blog/tags" = ["new"] -"blog/categories" = ["meta"] +"blog/tags" = ["meta", "new"] +++ Thought it would be a good idea to have somewhere to put my ramblings, and so I am here. diff --git a/templates/blog/categories/list.html b/templates/blog/categories/list.html deleted file mode 100644 index 69d6621..0000000 --- a/templates/blog/categories/list.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "content.html" %} -{% block title %}Categories - {{ config.title }}{% endblock %} -{% block content %} -

Categories

- {% if terms %} - - {% endif %} -{% endblock content %} diff --git a/templates/blog/categories/single.html b/templates/blog/categories/single.html deleted file mode 100644 index c55b8b4..0000000 --- a/templates/blog/categories/single.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "content.html" %} -{% import "post_macros.html" as post_macros %} -{% block title %}Category {{ term.name }} - {{ config.title }}{% endblock %} -{% block content %} -

Category: {{ term.name }} (RSS)

- {% for page in term.pages %} - {{ post_macros::page_in_list(page=page) }} - {% endfor %} -{% endblock content %} diff --git a/templates/blog/post.html b/templates/blog/post.html index b352ca7..45ee2e0 100644 --- a/templates/blog/post.html +++ b/templates/blog/post.html @@ -18,13 +18,9 @@ {% if config.extra.author %} Published by {{ config.extra.author }} {% endif %} - {% if page.taxonomies | get(key="blog/categories") %} - {% set categories = page.taxonomies | get(key="blog/categories") %} - in {{ categories[0] }} - {% endif %} {% set tags = page.taxonomies | get(key="blog/tags") %} {% if tags %} - and tagged + with tags {% for tag in tags %} {{ tag }} {% if tags | length > 1 %} diff --git a/templates/blog/tags/list.html b/templates/blog/tags/list.html index a8cc9d0..cd175ef 100644 --- a/templates/blog/tags/list.html +++ b/templates/blog/tags/list.html @@ -1,5 +1,6 @@ {% extends "content.html" %} {% block title %}Tag - {{ config.title }}{% endblock %} +{% block meta_description %}Full list of tags used for articles within the blog.{% endblock meta_description %} {% block content %}

Tags

{% if terms %}