pages, listing et aussi .social

templates/base.html

@@ -67,11 +67,17 @@
     {% endif %}
     {% endif %}
   </nav>
-  {% if SOCIAL %}
   <nav class="social">
-    {% for text, link, icon in SOCIAL %}
+    {% if SOCIAL_WITH_FA %}
+    {% for text, link, icon in SOCIAL_WITH_FA %}
     <a href="{{ link }}" title="{{ text }}"><i class="fa {{ icon }}"></i></a>
     {% endfor %}
+    {% endif %}
+    {% if SOCIAL %}
+    {% for text, link in SOCIAL %}
+    <a href="{{ link }}" title="{{ text }}">{{ text }}</i></a>
+    {% endfor %}
+    {% endif %}
     {% if CATEGORY_FEED_ATOM and category %}
     <a href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" title="Flux pour {{ category }}" target="_blank"><i class="fa fa-rss"></i></a>
     {% endif %}
@@ -79,7 +85,6 @@
     <a href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" title="Flux pour {{ tag }}" target="_blank"><i class="fa fa-rss"></i></a>
     {% endif %}
   </nav>
-  {% endif %}
   {% endblock %}
 </header>
 

templates/listing.html

@@ -2,9 +2,9 @@
 {% block content %}
 {% for article in articles_page.object_list %}
   <article>
-    <h1>
+    <h2>
       {{ article.title }}
-    </h1>
+    </h2>
     <p>
       {{ article.subtitle }}<br/>
       {{ article.description }} <br/>

templates/page.html

@@ -8,6 +8,20 @@
 
 {% block content %}
 <article>
+{% if DISPLAY_PAGE_HEADER %}
+<hgroup>
+  <h1>
+    {{ page.title }}
+  </h1>
+  <p>
+    {% if page.modified %}
+    Modifié le <time datetime="{{ page.modified.isoformat() }}">{{ page.modified|strftime('%A %d %B %Y') }}</time>
+    {% else %}
+    Publié le <time datetime="{{ page.date.isoformat() }}">{{ page.date|strftime('%A %d %B %Y') }}</time>
+    {% endif %}
+  </p>
+</hgroup>
+{% endif %}
   {{ page.content }}
 </article>
 {% endblock %}