summaryrefslogtreecommitdiff
path: root/theme/templates
diff options
context:
space:
mode:
authorSébastien Dailly <sebastien@chimrod.com>2013-04-28 19:54:45 +0200
committerSébastien Dailly <sebastien@chimrod.com>2013-05-01 10:33:08 +0200
commitdc214056449119b29ad7b19b8d47e81b343ff453 (patch)
treee5fbae31ed73509852d45354ab682e8c96e5c42f /theme/templates
parentbfc347fdea8ebf0246902cbf7c95cfd5b518b4e8 (diff)
Updated theme and templates
Updated to pelican 3.2
Diffstat (limited to 'theme/templates')
-rwxr-xr-xtheme/templates/archives.html2
-rwxr-xr-xtheme/templates/article.html52
-rwxr-xr-xtheme/templates/category.html3
-rwxr-xr-xtheme/templates/index.html3
-rwxr-xr-xtheme/templates/menu.html6
-rwxr-xr-xtheme/templates/meta.html17
-rwxr-xr-xtheme/templates/page.html2
-rwxr-xr-xtheme/templates/tag.html3
8 files changed, 50 insertions, 38 deletions
diff --git a/theme/templates/archives.html b/theme/templates/archives.html
index f3c2990..f0441d9 100755
--- a/theme/templates/archives.html
+++ b/theme/templates/archives.html
@@ -3,7 +3,7 @@
{%block title %}{{ SITENAME }} - Archives{%endblock%}
{% block content %}
- <h2 class="page_title">Archives</h2>
+ <h1 class="page_title">Archives</h1>
<table id="archives">
<tbody>
{% for article in dates %}
diff --git a/theme/templates/article.html b/theme/templates/article.html
index 1328834..044c386 100755
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -3,38 +3,40 @@
{% block title %}{{ SITENAME }} - {{ article.title |striptags }}{% endblock %}
{% block content %}
- <article class="post">
- <h1 class="page_title"><a href="{{ article.url }}">{{ article.title }}</a></h1>
- {%include 'meta.html'%}
+ <article class="post">
+ <h1 class="page_title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+ {%include 'meta.html'%}
+
+ <section class="post_content">
+ {{ article.content }}
+ </section>
+
+ </article>
- <section class="post_content">
- {{ article.content }}
- </section>
+ {% if DISQUS_SITENAME %}
+ <div class="comments">
+ <h2>Commentaires&nbsp;:</h2>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
+ var disqus_identifier = "{{ article.url }}";
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
+ </script>
+ </div>
+ {% endif %}
- </article>
+ {% if article.related_posts and article.related_posts %}
- {% if DISQUS_SITENAME %}
- <div class="comments">
- <h2>Commentaires&nbsp;:</h2>
- <div id="disqus_thread"></div>
- <script type="text/javascript">
- var disqus_identifier = "{{ article.url }}";
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
- </script>
- </div>
- {% endif %}
+ <h2>&Agrave; lire aussi&nbsp;:</h2>
-{#
- {% if article.related_posts %}
<ul>
{% for related_post in article.related_posts %}
- <li>{{ related_post.url }}</li>
+ <li><a href="{{ SITEURL }}/{{ related_post.url }}">{{ related_post.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
-#}
+
{% endblock %}
diff --git a/theme/templates/category.html b/theme/templates/category.html
index f476d93..b323285 100755
--- a/theme/templates/category.html
+++ b/theme/templates/category.html
@@ -2,7 +2,7 @@
{% block title %}{{ SITENAME }} - {{ category}}{% endblock %}
{% block content %}
- <h2 class="page_title">Articles dans la catégorie «{{ category }}»</h2>
+ <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) %}
<article class="post">
@@ -11,6 +11,7 @@
<section class="post_content">
{{ article.summary }}
+ <div class="clear" />
{% if not loop.last %}
<hr>
{% endif %}
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 245c708..d045910 100755
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -5,11 +5,12 @@
{% if articles %}
{% for article in (articles_page.object_list if articles_page else articles) %}
<article class="post">
- <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
+ <h1 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h1>
<time class="meta" datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.locale_date }}</time>
<section class="post_content">
{{ article.summary }}
+ <div class="clear" />
{% if not loop.last %}
<hr>
{% endif %}
diff --git a/theme/templates/menu.html b/theme/templates/menu.html
index 037d85a..bab98fa 100755
--- a/theme/templates/menu.html
+++ b/theme/templates/menu.html
@@ -1,6 +1,6 @@
{% macro submenu(elements, link, name) -%}
{% if elements %}
- <li class='has-sub'><a href="{{ SITEURL }}/{{link}}.html"><span>{{name}}</span></a>
+ <li class='has-sub'><span><a href="{{ SITEURL }}/{{link}}.html">{{name}}</a></span>
<ul>
{% for tag, articles in elements %}
<li><a href="{{SITEURL}}/{{tag.url}}"><span>{{ tag }}</span></a></li>
@@ -12,7 +12,7 @@
<div id="cssmenu">
<ul>
- <li class='has-sub'><a href="{{ SITEURL }}/">Articles</a>
+ <li class='has-sub'><span><a href="{{ SITEURL }}/">Articles</a></span>
<ul>
{% for article in articles %}
{% if loop.index < FEED_MAX_ITEMS %}
@@ -26,7 +26,7 @@
{{ submenu(categories, 'categories', 'Catégories') }}
- <li class='has-sub'><a href="{{ SITEURL }}/"><span>À lire</span></a>
+ <li class='has-sub'><span>À lire</span>
<ul>
{% for page in pages %}
<li><a href="{{SITEURL}}/{{page.url}}"><span>{{ page.title }}</span></a></li>
diff --git a/theme/templates/meta.html b/theme/templates/meta.html
index db36173..287f6b2 100755
--- a/theme/templates/meta.html
+++ b/theme/templates/meta.html
@@ -1,5 +1,12 @@
- <details class="meta">
- Publié le <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.locale_date }}</time>
- {% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>».
- {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
- </details>
+<details class="meta">
+ Publié le <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.locale_date }}</time>
+{# {% if article.author %} par {{ article.author }}{% endif %} #}
+ dans
+ «&thinsp;<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>&thinsp;».
+ {% if article.tags %}
+ Mots-clefs&thinsp;:
+ {% for tag in article.tags %}{%if loop.index > 1%},{%endif%}
+ <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}
+ </p>
+ {% endif %}
+</details>
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 1608771..114daea 100755
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% block title %}{{ page.title }}{% endblock %}
+{% block title %}{{ page.title | striptags }}{% endblock %}
{% block content %}
<h1 class="page_title"><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></h1>
{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index 49ed222..8282855 100755
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -2,7 +2,7 @@
{% block title %}{{ SITENAME }} - «{{ tag }}»{% endblock %}
{% block content %}
- <h2 class="page_title">Articles avec le mot-clé «{{ tag }}»</h2>
+ <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) %}
<article class="post">
@@ -11,6 +11,7 @@
<section class="post_content">
{{ article.summary }}
+ <div class="clear" />
{% if not loop.last %}
<hr>
{% endif %}