jinjify

getnikola · Aug 19, 2016 · e6a8d43 · e6a8d43
1 parent 2e72ad7
commit e6a8d43
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/listing.tmpl b/nikola/data/themes/base-jinja/templates/listing.tmpl
@@ -14,10 +14,13 @@
 </ul>
 {% endif %}
 {% if code %}
+    <h1>{{ title }}
+        {% if source_link %}
+            <small><a href="{{ source_link }}">({{ messages("Source") }})</a></small>
+        {% endif %}
+        </h1>
     {{ code }}
 {% endif %}
-{% if source_link %}
-    <p class="sourceline"><a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a></p>
-{% endif %}
 {% endblock %}
 
+
diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl
@@ -2,14 +2,20 @@
 {% extends 'index.tmpl' %}
 
 {% block content_header %}
-    {% if subcategories %}
-    {{ messages('Subcategories:') }}
-    <ul>
-        {% for name, link in subcategories %}
-        <li><a href="{{ link }}">{{ name|e }}</a></li>
-        {% endfor %}
-    </ul>
-    {% endif %}
+    <header>
+        <h1>{{ title|e }}</h1>
+        {% if description %}
+        <p>{{ description }}</p>
+        {% endif %}
+        {% if subcategories %}
+        {{ messages('Subcategories:') }}
+        <ul>
+            {% for name, link in subcategories %}
+            <li><a href="{{ link }}">{{ name|e }}</a></li>
+            {% endfor %}
+        </ul>
+        {% endif %}
+    </header>
 {% endblock %}
 
 {% block extra_head %}

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/listing.tmpl
@@ -1,11 +1,10 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'base.tmpl' %}
 {% import 'crumbs.tmpl' as ui with context %}
-
 {% block content %}
 {{ ui.bar(crumbs) }}
 {% if folders or files %}
-<ul class="list-unstyled">
+<ul>
 {% for name in folders %}
     <li><a href="{{ name|urlencode }}"><i class="glyphicon glyphicon-folder-open"></i> {{ name|e }}</a>
 {% endfor %}
@@ -15,6 +14,11 @@
 </ul>
 {% endif %}
 {% if code %}
+<h1>{{ title }}
+    {% if source_link %}
+        <small><a href="{{ source_link }}">({{ messages("Source") }})</a></small>
+    {% endif %}
+    </h1>
     {{ code }}
 {% endif %}
 {% endblock %}