summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
authorSébastien Dailly <sebastien@chimrod.com>2013-05-09 14:40:47 +0200
committerSébastien Dailly <sebastien@chimrod.com>2013-05-09 14:41:31 +0200
commitc1f9a31f0c8d6a75e8ab902720f0c4c4830ba6fc (patch)
tree3b102fb68ddcbef8c93fb2fad4c9a16f7d541247 /theme
parent302756ec2b2712faf049ea7de5f094c09816d2c9 (diff)
Updated theme
Diffstat (limited to 'theme')
-rw-r--r--theme/templates/abstract.html7
-rwxr-xr-xtheme/templates/category.html12
-rwxr-xr-xtheme/templates/index.html15
-rwxr-xr-xtheme/templates/tag.html12
4 files changed, 14 insertions, 32 deletions
diff --git a/theme/templates/abstract.html b/theme/templates/abstract.html
index 57ff2ab..5d10bfc 100644
--- a/theme/templates/abstract.html
+++ b/theme/templates/abstract.html
@@ -1,4 +1,5 @@
-{% macro abstract(article, title_level) %}
+{% macro abstract(title_level) %}
+ {% for article in (articles_page.object_list if articles_page else articles) %}
<article class="post">
<{{title_level}} class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{article.title }}</a></{{title_level}}>
@@ -16,4 +17,8 @@
<div class="clear" />
</section>
</article>
+
+ {% endfor %}
+
+ {% include 'navigator.html' %}
{% endmacro %}
diff --git a/theme/templates/category.html b/theme/templates/category.html
index f3588eb..30284ca 100755
--- a/theme/templates/category.html
+++ b/theme/templates/category.html
@@ -1,18 +1,12 @@
{% extends "base.html" %}
-{% block title %}{{ SITENAME }} - {{ category}}{% endblock %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
{% block content %}
<h1 class="page_title">Articles dans la catégorie «&thinsp;{{ category }}&thinsp;»</h1>
{% if articles %}
- {% for article in (articles_page.object_list if articles_page else articles) %}
- {% import 'abstract.html' as abstract with context %}
- {{ abstract.abstract(article, "h2") }}
- {% if not loop.last %}
- <hr>
- {% endif %}
- {% endfor %}
+ {% import 'abstract.html' as abstract with context %}
+ {{ abstract.abstract("h2") }}
{% endif %}
- {% include 'navigator.html' %}
{% if CATEGORY_FEED_RSS %}
<a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS % category|e|lower}}" ><img src="../theme/images/rss.png" /></a>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index a54ae31..e35bb04 100755
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -2,19 +2,11 @@
{% block title %}{{ SITENAME }} - Accueil{% endblock %}
{% block content %}
- {% if articles %}
- {% for article in (articles_page.object_list if articles_page else articles) %}
+ {% if articles %}
{% import 'abstract.html' as abstract with context %}
- {{ abstract.abstract(article, "h1") }}
-
- {% if not loop.last %}
- <hr>
- {% endif %}
-
- {% endfor %}
-
- {% include 'navigator.html' %}
+ {{ abstract.abstract("h1") }}
+ {% endif %}
{% if FEED_RSS %}
<a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" ><img src="../theme/images/rss.png" /></a>
@@ -24,5 +16,4 @@
<a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" ><img src="../theme/images/atom.png" /></a>
{% endif %}
- {% endif %}
{% endblock %}
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index 101a22d..533ca5c 100755
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -1,20 +1,12 @@
{% extends "base.html" %}
-{% block title %}{{ SITENAME }} - «{{ tag }}»{% endblock %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
{% block content %}
<h1 class="page_title">Articles avec le mot-clef «&thinsp;{{ tag }}&thinsp;»</h1>
{% if articles %}
- {% for article in (articles_page.object_list if articles_page else articles) %}
{% import 'abstract.html' as abstract with context %}
- {{ abstract.abstract(article, "h2") }}
-
- {% if not loop.last %}
- <hr>
- {% endif %}
-
- {% endfor %}
+ {{ abstract.abstract("h2") }}
{% endif %}
- {% include 'navigator.html' %}
{% if TAG_FEED_RSS %}
<a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS % tag|e|lower}}" ><img src="../theme/images/rss.png" /></a>