diff --git a/alchemy/templates/archives.html b/alchemy/templates/archives.html index 686a1de..5fe6dee 100644 --- a/alchemy/templates/archives.html +++ b/alchemy/templates/archives.html @@ -1,15 +1,18 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Archives +Archives {{ super() }} +{% endblock %} + +{% block page_header %} +Archives {% endblock %} {% block content %} -

Archives

-
- {% for article in dates %} -
{{ article.locale_date }}
-
{{ article.title }}
- {% endfor %} -
+
+ {% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+ {% endfor %} +
{% endblock %} diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html index 71de071..3d95c13 100644 --- a/alchemy/templates/article.html +++ b/alchemy/templates/article.html @@ -1,56 +1,45 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - {% if article.author %} - - {% endif %} - {% if article.summary %} - - {% endif %} - +{{ super() }} +{% if article.summary %} + +{% endif %} {% endblock %} {% block title %} - {{ SITENAME }} — {{ article.title|striptags }} +{{ article.title|striptags }} {{ super() }} +{% endblock %} + +{% block page_header %} +{{ article.title }} {% endblock %} {% block content %} -
-

- {{ article.title }} -

+
+
-
- {{ article.content }} -
-
-
- {% include 'include/disqus_comments.html' %} +
+ {{ article.content }}
+
+
+{% include 'include/comments.html' %} {% endblock %} diff --git a/alchemy/templates/author.html b/alchemy/templates/author.html index f457216..a87730b 100644 --- a/alchemy/templates/author.html +++ b/alchemy/templates/author.html @@ -1,9 +1,9 @@ {% extends "index.html" %} {% block title %} - {{ SITENAME }} — Articles by {{ author }} +{{ author }} Articles — {{ SITENAME }} {% endblock %} -{% block page_title %} -

Articles by {{ author }}

+{% block page_header %} +{{ author }} Articles {% endblock %} diff --git a/alchemy/templates/authors.html b/alchemy/templates/authors.html index 220c7f4..c1c3c9f 100644 --- a/alchemy/templates/authors.html +++ b/alchemy/templates/authors.html @@ -1,14 +1,17 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Authors +Authors {{ super() }} +{% endblock %} + +{% block page_header %} +Authors {% endblock %} {% block content %} -

Authors on {{ SITENAME }}

- + {% endblock %} diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html index 6d05c87..c441a36 100644 --- a/alchemy/templates/base.html +++ b/alchemy/templates/base.html @@ -3,50 +3,150 @@ {% block head %} - - - - + + + - {% block title %}{{ SITE_SUBTEXT }}{% endblock title %} + {% block title %}— {{ SITENAME }}{% endblock %} + - {% if EXTRA_FAVICON %} - - - - - - {% endif %} + {% if FEED_ALL_ATOM %} + + {% endif %} + {% if FEED_ALL_RSS %} + + {% endif %} + {% if FEED_ATOM %} + + {% endif %} + {% if FEED_RSS %} + + {% endif %} + {% if CATEGORY_FEED_ATOM and category %} + + {% endif %} + {% if CATEGORY_FEED_RSS and category %} + + {% endif %} + {% if TAG_FEED_ATOM and tag %} + + {% endif %} + {% if TAG_FEED_RSS and tag %} + + {% endif %} + {% if SHOW_FAVICONS %} + + + + {% endif %} - {% if FEED_ATOM %} - - {% endif %} - {% if FEED_RSS %} - - {% endif %} + + + + - - - - - {% include "include/google_analytics.html" %} + + + {% endblock %} - {% include "include/header.html" %} -
- {% block content %}{% endblock %} +
+
+
+
+ {% if SITE_IMAGE %} + + {% endif %} +
+
+

{{ SITENAME }}

+

{{ SITE_TAGLINE }}

+
+ {% if HEADER_LINKS or SHOW_HEADER_PAGES or EMAIL_ADDRESS or FACEBOOK_ADDRESS or GITHUB_ADDRESS or GOOGLE_ADDRESS or TWITTER_ADDRESS %} +
    + {% if HEADER_LINKS %} + {% for title, link in HEADER_LINKS %} +
  • {{ title }}
    • + {% endfor %} + {% endif %} + {% if SHOW_HEADER_PAGES %} + {% for p in PAGES %} + {% if loop.first %} +
  • |
    • + {% endif %} +
  • {{ p.title }}
    • + {% endfor %} + {% endif %} + {% if EMAIL_ADDRESS or FACEBOOK_ADDRESS or GITHUB_ADDRESS or GOOGLE_ADDRESS or TWITTER_ADDRESS %} +
  • |
    • + {% endif %} + {% if EMAIL_ADDRESS %} +
    • + {% endif %} + {% if FACEBOOK_ADDRESS %} +
    • + {% endif %} + {% if FEED_ALL_ATOM %} +
    • + {% endif %} + {% if GITHUB_ADDRESS %} +
    • + {% endif %} + {% if GOOGLE_ADDRESS %} +
    • + {% endif %} + {% if TWITTER_ADDRESS %} +
    • + {% endif %} +
+ {% endif %} +
+
+
- {% include "include/footer.html" %} - - +
+
+
+

{% block page_header %}{% endblock %}

+
+ {% block content %}{% endblock %} +
+
+ +
+
+
+
+ {% if SHOW_FOOTER_AUTHORS or SHOW_FOOTER_ARCHIVES or SHOW_FOOTER_CATEGORIES or SHOW_FOOTER_TAGS %} +
    + {% if SHOW_ARTICLE_AUTHOR and SHOW_FOOTER_AUTHORS %} +
  • Authors
    • + {% endif %} + {% if SHOW_FOOTER_ARCHIVES %} +
  • Archives
    • + {% endif %} + {% if SHOW_FOOTER_CATEGORIES %} +
  • Categories
    • + {% endif %} + {% if SHOW_FOOTER_TAGS %} +
  • Tags
    • + {% endif %} +
+ {% endif %} +
+ +
+
+
diff --git a/alchemy/templates/categories.html b/alchemy/templates/categories.html index 25a5b30..06dfa6c 100644 --- a/alchemy/templates/categories.html +++ b/alchemy/templates/categories.html @@ -1,14 +1,17 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Categories +Categories {{ super() }} +{% endblock %} + +{% block page_header %} +Categories {% endblock %} {% block content %} -

Categories on {{ SITENAME }}

-
    - {% for category, articles in categories %} -
  • {{ category }}
    • - {% endfor %} -
+
    + {% for category, articles in categories %} +
  • {{ category }}
    • + {% endfor %} +
{% endblock %} diff --git a/alchemy/templates/category.html b/alchemy/templates/category.html index 235459d..40c78bc 100644 --- a/alchemy/templates/category.html +++ b/alchemy/templates/category.html @@ -1,9 +1,9 @@ {% extends "index.html" %} {% block title %} - {{ SITENAME }} — Articles in the {{ category }} category +{{ category }} Articles — {{ SITENAME }} {% endblock %} -{% block page_title %} -

Articles in the {{ category }} category

+{% block page_header %} +{{ category }} Articles {% endblock %} diff --git a/alchemy/templates/include/footer.html b/alchemy/templates/include/footer.html deleted file mode 100644 index 0bde482..0000000 --- a/alchemy/templates/include/footer.html +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/alchemy/templates/include/header.html b/alchemy/templates/include/header.html deleted file mode 100644 index 01e51e5..0000000 --- a/alchemy/templates/include/header.html +++ /dev/null @@ -1,61 +0,0 @@ -
-
- {% if PROFILE_IMAGE %} -
- -
- {% endif %} -
-

- {{ SITENAME }} -

-

{{ SITE_SUBTEXT }}

-
    - {% for title, link in MENU_ITEMS %} -
  • {{ title }}
    • - {% endfor %} - {% if PAGES_ON_MENU %} - {% for p in PAGES %} - {% if loop.first %} -
  • |
    • - {% endif %} -
  • {{ p.title }}
    • - {% if loop.last %} -
  • |
    • - {% endif %} - {% endfor %} - {% endif %} - {% if CATEGORIES_ON_MENU %} -
  • Categories
    • -
  • |
    • - {% endif %} - {% if TAGS_ON_MENU %} -
  • Tags
    • -
  • |
    • - {% endif %} - {% if ARCHIVES_ON_MENU %} -
  • Archives
    • -
  • |
    • - {% endif %} - {% if EMAIL_ADDRESS %} -
    • - {% endif %} - {% if GITHUB_ADDRESS %} -
    • - {% endif %} - {% if SO_ADDRESS %} -
    • - {% endif %} - {% if TWITTER_ADDRESS %} -
    • - {% endif %} - {% if FB_ADDRESS %} -
    • - {% endif %} - {% if FEED_ATOM or FEED_RSS %} -
    • - {% endif %} -
-
-
-
diff --git a/alchemy/templates/include/pagination.html b/alchemy/templates/include/pagination.html index 1ca9e0b..9eb3052 100644 --- a/alchemy/templates/include/pagination.html +++ b/alchemy/templates/include/pagination.html @@ -1,11 +1,15 @@ {% if DEFAULT_PAGINATION %} - +
    + {% if articles_page.has_previous() %} +
  • «
    • + {% else %} +
  • «
    • + {% endif %} +
  • {{ articles_page.number }} of {{ articles_paginator.num_pages }}
    • + {% if articles_page.has_next() %} +
  • »
    • + {% else %} +
  • »
    • + {% endif %} +
{% endif %} diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html index 222637b..a03893b 100644 --- a/alchemy/templates/index.html +++ b/alchemy/templates/index.html @@ -1,44 +1,36 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - - +{{ super() }} + +{% endblock %} + +{% block title %} +{{ SITENAME }} — {{ SITE_TAGLINE }} +{% endblock %} + +{% block page_header %} +All Articles {% endblock %} {% block content %} - {% block page_title %} -

All Articles

- {% endblock %} -
- {% for article in articles_page.object_list %} -
-
-
-

- {{ article.locale_date }} -

-

- {{ article.category }} -

- {% if article.author and SHOW_ARTICLE_AUTHOR %} -
- By {{ article.author }} -
- {% endif %} -
-
-

- {{ article.title }} -

-
- {{ article.content|striptags|truncate(256) }} -
-
-
-
- {% endfor %} +{% for article in articles_page.object_list %} +
+
+ +
+

{{ article.title }}

+

{{ article.summary }}

+
- {% include 'include/pagination.html' %}
+
+{% endfor %} +{% include 'include/pagination.html' %} {% endblock %} diff --git a/alchemy/templates/page.html b/alchemy/templates/page.html index 8072a9d..8b9c889 100644 --- a/alchemy/templates/page.html +++ b/alchemy/templates/page.html @@ -1,25 +1,24 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - {% if page.author %} - - {% endif %} - {% if page.summary %} - - {% endif %} - +{{ super() }} +{% if page.summary %} + +{% endif %} {% endblock %} {% block title %} - {{ SITENAME }} — {{ page.title|striptags }} +{{ page.title|striptags }} {{ super() }} +{% endblock %} + +{% block page_header %} +{{ page.title }} {% endblock %} {% block content %} -
-

{{ page.title }}

-
- {{ page.content }} -
+
+
+ {{ page.content }}
+
{% endblock %} diff --git a/alchemy/templates/period_archives.html b/alchemy/templates/period_archives.html new file mode 100644 index 0000000..7c81fae --- /dev/null +++ b/alchemy/templates/period_archives.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %} +Archives for {{ period | reverse | join(' ') }} {{ super() }} +{% endblock %} + +{% block page_header %} +Archives for {{ period | reverse | join(' ') }} +{% endblock %} + +{% block content %} +
+ {% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+ {% endfor %} +
+{% endblock %} diff --git a/alchemy/templates/tag.html b/alchemy/templates/tag.html index 448bb91..1a1c578 100644 --- a/alchemy/templates/tag.html +++ b/alchemy/templates/tag.html @@ -1,9 +1,9 @@ {% extends "index.html" %} {% block title %} - {{ SITENAME }} — Articles with the {{ tag }} tag +#{{ tag }} Articles — {{ SITENAME }} {% endblock %} -{% block page_title %} -

Articles with the {{ tag }} tag

+{% block page_header %} +#{{ tag }} Articles {% endblock %} diff --git a/alchemy/templates/tags.html b/alchemy/templates/tags.html index dcc538d..6675fe9 100644 --- a/alchemy/templates/tags.html +++ b/alchemy/templates/tags.html @@ -1,14 +1,17 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Tags +Tags {{ super() }} +{% endblock %} + +{% block page_header %} +Tags {% endblock %} {% block content %} -

Tags on {{ SITENAME }}

-
    - {% for tag, articles in tags|sort %} -
  • {{ tag }} ({{ articles|count }})
    • - {% endfor %} -
+
    + {% for tag, articles in tags|sort %} +
  • #{{ tag }} ({{ articles|count }})
    • + {% endfor %} +
{% endblock %}