diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html index b1c0e932..e5a6a429 100644 --- a/pelican/tests/output/basic/categories.html +++ b/pelican/tests/output/basic/categories.html @@ -2,7 +2,7 @@ - A Pelican Blog + A Pelican Blog - Categories @@ -21,10 +21,10 @@
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html index 1d802b29..ad887b7b 100644 --- a/pelican/tests/output/custom/categories.html +++ b/pelican/tests/output/custom/categories.html @@ -2,7 +2,7 @@ - Alexis' log + Alexis' log - Categories @@ -25,10 +25,10 @@
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html index a4728315..694a2bd6 100644 --- a/pelican/tests/output/custom_locale/categories.html +++ b/pelican/tests/output/custom_locale/categories.html @@ -2,7 +2,7 @@ - Alexis' log + Alexis' log - Categories @@ -25,10 +25,10 @@
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html index 050f2686..cd129507 100644 --- a/pelican/themes/simple/templates/archives.html +++ b/pelican/themes/simple/templates/archives.html @@ -1,4 +1,7 @@ {% extends "base.html" %} + +{% block title %}{{ SITENAME }} - Archives{% endblock %} + {% block content %}

Archives for {{ SITENAME }}

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html index fb01b337..9dcf1bc2 100644 --- a/pelican/themes/simple/templates/article.html +++ b/pelican/themes/simple/templates/article.html @@ -1,4 +1,7 @@ {% extends "base.html" %} + +{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %} + {% block head %} {{ super() }} {% if article.description %} @@ -24,17 +27,30 @@ - {% if article.modified %} + {% if article.modified %} - {% endif %} + {% endif %} {% if article.authors %}
By {% for author in article.authors %} {{ author }} {% endfor %}
+ {% if article.category %} +
+ Category: {{ article.category }} +
+ {% endif %} + {% if article.tags %} +
+ Tags: + {% for tag in article.tags %} + {{ tag }} + {% endfor %} +
+ {% endif %} {% endif %}
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html index e9f78702..a1901946 100644 --- a/pelican/themes/simple/templates/author.html +++ b/pelican/themes/simple/templates/author.html @@ -1,6 +1,7 @@ {% extends "index.html" %} {% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %} + {% block content_title %}

Articles by {{ author }}

{% endblock %} diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html index e29be0ca..ec138480 100644 --- a/pelican/themes/simple/templates/categories.html +++ b/pelican/themes/simple/templates/categories.html @@ -1,8 +1,11 @@ {% extends "base.html" %} + +{% block title %}{{ SITENAME }} - Categories{% endblock %} + {% block content %}
    -{% for category, articles in categories %} -
  • {{ category }}
    • +{% for category, articles in categories|sort %} +
  • {{ category }} ({{ articles|count }})
    • {% endfor %}
{% endblock %} diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html index 4e6fd24e..14d7ff09 100644 --- a/pelican/themes/simple/templates/category.html +++ b/pelican/themes/simple/templates/category.html @@ -1,4 +1,7 @@ {% extends "index.html" %} + +{% block title %}{{ SITENAME }} - {{ category }} category{% endblock %} + {% block content_title %}

Articles in the {{ category }} category

{% endblock %} diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html index 5ceb7796..999dd841 100644 --- a/pelican/themes/simple/templates/page.html +++ b/pelican/themes/simple/templates/page.html @@ -1,5 +1,7 @@ {% extends "base.html" %} -{% block title %}{{ page.title }}{%endblock%} + +{% block title %}{{ SITENAME }} - {{ page.title }}{%endblock%} + {% block content %}

{{ page.title }}

{% import 'translations.html' as translations with context %} @@ -7,9 +9,9 @@ {{ page.content }} - {% if page.modified %} -

- Last updated: {{ page.locale_modified }} -

- {% endif %} + {% if page.modified %} +

+ Last updated: {{ page.locale_modified }} +

+ {% endif %} {% endblock %} diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html index d930dbbb..e1ddf626 100644 --- a/pelican/themes/simple/templates/period_archives.html +++ b/pelican/themes/simple/templates/period_archives.html @@ -1,4 +1,7 @@ {% extends "base.html" %} + +{% block title %}{{ SITENAME }} - {{ period | reverse | join(' ') }} archives{% endblock %} + {% block content %}

Archives for {{ period | reverse | join(' ') }}

diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html index e69de29b..9c958030 100644 --- a/pelican/themes/simple/templates/tag.html +++ b/pelican/themes/simple/templates/tag.html @@ -0,0 +1,7 @@ +{% extends "index.html" %} + +{% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %} + +{% block content_title %} +

Articles tagged with {{ tag }}

+{% endblock %}