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

Archives

-
- {% for article in dates %} -
{{ article.locale_date }}
-
{{ article.title }}
- {% endfor %} -
+

Archives

+
+ {% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+ {% endfor %} +
{% endblock %} diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html index 4b6b64a..375cab9 100644 --- a/alchemy/templates/article.html +++ b/alchemy/templates/article.html @@ -1,48 +1,48 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - {% if article.author %} - - {% endif %} - {% if article.summary %} - - {% endif %} - + {{ super() }} + {% if article.author %} + + {% endif %} + {% if article.summary %} + + {% endif %} + {% endblock %} {% block title %} - {{ SITENAME }} — {{ article.title|striptags }} + {{ SITENAME }} — {{ article.title|striptags }} {% endblock %} {% block content %} -
-

- {{ article.title }} -

- -
- {{ article.content }} -
-
-
-
- {% include 'include/disqus_comments.html' %} +
+

+ {{ article.title }} +

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

Articles by {{ author }}

+

Articles by {{ author }}

{% endblock %} diff --git a/alchemy/templates/authors.html b/alchemy/templates/authors.html index ffccd94..220c7f4 100644 --- a/alchemy/templates/authors.html +++ b/alchemy/templates/authors.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Authors + {{ SITENAME }} — Authors {% endblock %} {% block content %} -

Authors on {{ SITENAME }}

- +

Authors on {{ SITENAME }}

+ {% endblock %} diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html index 30bc5ad..a182f61 100644 --- a/alchemy/templates/base.html +++ b/alchemy/templates/base.html @@ -2,50 +2,50 @@ - {% block head %} - - - + {% block head %} + + + - {% block title %}{{ SITE_SUBTEXT }}{% endblock title %} + {% block title %}{{ SITE_SUBTEXT }}{% endblock title %} - {% if EXTRA_FAVICON %} - - - - - - {% endif %} + {% if EXTRA_FAVICON %} + + + + + + {% endif %} - {% if FEED_ATOM %} - - {% endif %} - {% if FEED_RSS %} - - {% endif %} + {% if FEED_ATOM %} + + {% endif %} + {% if FEED_RSS %} + + {% endif %} - + - + - {% include "include/google_analytics.html" %} - {% endblock %} + {% include "include/google_analytics.html" %} + {% endblock %} - {% include "include/header.html" %} -
- {% block content %}{% endblock %} -
- {% include "include/footer.html" %} + {% include "include/header.html" %} +
+ {% block content %}{% endblock %} +
+ {% include "include/footer.html" %} - - + + diff --git a/alchemy/templates/categories.html b/alchemy/templates/categories.html index 99c1dce..25a5b30 100644 --- a/alchemy/templates/categories.html +++ b/alchemy/templates/categories.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Categories + {{ SITENAME }} — Categories {% endblock %} {% block content %} -

Categories on {{ SITENAME }}

- +

Categories on {{ SITENAME }}

+ {% endblock %} diff --git a/alchemy/templates/category.html b/alchemy/templates/category.html index cac10ce..235459d 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 + {{ SITENAME }} — Articles in the {{ category }} category {% endblock %} {% block page_title %} -

Articles in the {{ category }} category

+

Articles in the {{ category }} category

{% endblock %} diff --git a/alchemy/templates/include/disqus_comments.html b/alchemy/templates/include/disqus_comments.html index dab6527..244fc30 100644 --- a/alchemy/templates/include/disqus_comments.html +++ b/alchemy/templates/include/disqus_comments.html @@ -1,24 +1,24 @@ {% if DISQUS_SITENAME %} -
- - - - blog comments powered by Disqus - -
+
+ + + + blog comments powered by Disqus + +
{% endif %} diff --git a/alchemy/templates/include/footer.html b/alchemy/templates/include/footer.html index 20d293a..0bde482 100644 --- a/alchemy/templates/include/footer.html +++ b/alchemy/templates/include/footer.html @@ -1,10 +1,10 @@ diff --git a/alchemy/templates/include/google_analytics.html b/alchemy/templates/include/google_analytics.html index cbdc311..22ff2d5 100644 --- a/alchemy/templates/include/google_analytics.html +++ b/alchemy/templates/include/google_analytics.html @@ -1,17 +1,17 @@ {% if GOOGLE_ANALYTICS_ID and GOOGLE_ANALYTICS_DOMAIN %} - + {% endif %} diff --git a/alchemy/templates/include/header.html b/alchemy/templates/include/header.html index 3f21f53..4d9fd22 100644 --- a/alchemy/templates/include/header.html +++ b/alchemy/templates/include/header.html @@ -1,49 +1,49 @@
-
- {% if PROFILE_IMAGE %} -
- -
+
+ {% 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 %} -
    -

    - {{ 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 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 %} -
    -
    + {% 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 c63babe..1ca9e0b 100644 --- a/alchemy/templates/include/pagination.html +++ b/alchemy/templates/include/pagination.html @@ -1,11 +1,11 @@ {% if DEFAULT_PAGINATION %} - + {% endif %} diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html index 7bc97fb..222637b 100644 --- a/alchemy/templates/index.html +++ b/alchemy/templates/index.html @@ -1,44 +1,44 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - - + {{ super() }} + + {% 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) }} -
-
-
+ {% 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 %} -
- {% include 'include/pagination.html' %} +
+
+
+ {% endfor %} +
+ {% include 'include/pagination.html' %}
{% endblock %} diff --git a/alchemy/templates/page.html b/alchemy/templates/page.html index a588980..8072a9d 100644 --- a/alchemy/templates/page.html +++ b/alchemy/templates/page.html @@ -1,25 +1,25 @@ {% extends "base.html" %} {% block head %} - {{ super() }} - {% if page.author %} - - {% endif %} - {% if page.summary %} - - {% endif %} - + {{ super() }} + {% if page.author %} + + {% endif %} + {% if page.summary %} + + {% endif %} + {% endblock %} {% block title %} - {{ SITENAME }} — {{ page.title|striptags }} + {{ SITENAME }} — {{ page.title|striptags }} {% endblock %} {% block content %} -
-

{{ page.title }}

-
- {{ page.content }} -
+
+

{{ page.title }}

+
+ {{ page.content }}
+
{% endblock %} diff --git a/alchemy/templates/tag.html b/alchemy/templates/tag.html index 67f4acc..448bb91 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 + {{ SITENAME }} — Articles with the {{ tag }} tag {% endblock %} {% block page_title %} -

Articles with the {{ tag }} tag

+

Articles with the {{ tag }} tag

{% endblock %} diff --git a/alchemy/templates/tags.html b/alchemy/templates/tags.html index bb333d5..dcc538d 100644 --- a/alchemy/templates/tags.html +++ b/alchemy/templates/tags.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block title %} - {{ SITENAME }} — Tags + {{ SITENAME }} — Tags {% endblock %} {% block content %} -

Tags on {{ SITENAME }}

- +

Tags on {{ SITENAME }}

+ {% endblock %}