2 files changed, 20 insertions, 15 deletions
diff --git a/bn_django/git_wiki/templates/git_wiki/item.html b/bn_django/git_wiki/templates/git_wiki/item.html
index 98f1647..cf49753 100644
--- a/bn_django/git_wiki/templates/git_wiki/item.html
+++ b/bn_django/git_wiki/templates/git_wiki/item.html
@@ -5,27 +5,31 @@
 <link rel="STYLESHEET" type="text/css" href="/static/style/docutils.css" />
 {% endblock %}
 
+{% block right_stuff %}{{block.super}}
+<b>Item name:</b>
+    <span class="hash">{{ item.name }}</span><br />
+<b>Item hash:</b>
+    <span class="hash">{{ item.id }}</span><br />
+<br /><b>
+View as <a href="/k/{{ item.slug }}/pdf/">pdf</a>,<br />
+or as <a href="/k/{{ item.slug }}/latex/">LaTeX</a>,<br />
+or see the <a href="/k/{{ item.slug }}/raw/">raw source</a>.<br />
+<br />
+Browse the <a href="/k/{{ item.slug }}/log">changelog</a>
+</b>
+{% endblock %}
+
 {% block path %}{{ block.super }} &raquo; <a href="/k/{{ item.slug }}/">
     {{ item.path }}</a>{% endblock %}
 
-{% block title %}{% endblock %}
+{% comment %} Needed the extra .title css info... {% endcomment %}
+{% block title %}<h1 class="title"> {% if doc.title %}{{ doc.title }}{% else %}[Unititled Document]{% endif %}</h1>{% endblock %}
+
+{% block subtitle %}{% if doc.subtitle %}{{doc.subtitle}}{% endif %}{% endblock %}
 
 {% block gitwiki %}
 &nbsp;
-{{ doc.html_body|safe }}
-    <br /><hr />
-    <h3>Meta</h3>
-    <b>Item name:</b>
-        <span class="hash">{{ item.name }}</span><br />
-    <b>Item sha1 hash:</b>
-        <span class="hash">{{ item.id }}</span><br />
-    <br />
-    <span class="righty">
-    <a href="/k/{{ item.slug }}/raw/">raw</a> - 
-    <a href="/k/{{ item.slug }}/latex/">latex</a> - 
-    <a href="/k/{{ item.slug }}/pdf/">pdf</a> - 
-    <a href="/k/{{ item.slug }}/log">log</a>
-    </span>
+{{ doc.fragment|safe }}
     <br />
 {% endblock %}
 
diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html
index 40830bd..921d6ad 100644
--- a/bn_django/templates/base.html
+++ b/bn_django/templates/base.html
@@ -61,6 +61,7 @@
 {% block path %}{% endblock %}
 </span>
 <h1 class="pagetitle">{% block title %}Hey Hey Hey!{% endblock %}</h1>
+<h2 class="pagesubtitle">{% block subtitle %}{% endblock %}</h2>
 <div class="right_stuff">
 {% block right_stuff %}
 {% endblock %}