unify article info display and styling

[irc/freenode/web-7.0.git] / templates / article.html

diff --git a/templates/article.html b/templates/article.html
index a9febc116ef63ed9bbf5c5b67845fc440e4448f5..de10e5f871fe865aa0b09520e8059ea0d94bb226 100644 (file)
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,15 +1,11 @@
 {% extends "base.html" %}
+{% import "artinfo.html" as artinfo with context %}
 {% block content %}
-<div class="art">
-    <p><b class="art">{{ article.title }}</b>&nbsp;
-    <span class="art-date">{{ article.datetime }} by {{ article.author }}</span></p>
-    <p class="art-ingress">{{ article.content }}</p>
-    <p class="art-links">
-    {#
-        <a href="{{ next }}">Next</a>&nbsp;
-        <a href="{{ previous }}">Previous</a>&nbsp;
-        #}
-        <a href="{{ url_for("archive.html") }}">Archive</a>&nbsp;
-        </p>
+<div class="main">
+    {{ artinfo.info(article) }}
+    <div class="art-body">
+    {{ article.render() }}
+    </div>
+    {{ artinfo.nav(article) }}
 </div>
 {% endblock content %}