Made changes so knowledge items get the TOC banged right. Probably looks bad in other browsers...

4 files changed, 57 insertions, 16 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 %}
diff --git a/static/style/default.css b/static/style/default.css
index 97f588c..adc3bf5 100644
--- a/static/style/default.css
+++ b/static/style/default.css
@@ -23,6 +23,12 @@ h1 {
     font-size: 16pt;
     font-weight: bold;
     text-align: center; }
+h2.pagesubtitle {
+    font-size: 12pt;
+    font-weight: bold;
+    font-style: italic;
+    text-align: center;
+    border-bottom: none; }
 h3 {
     margin: 0px;
     padding-top: 8px;
diff --git a/static/style/docutils.css b/static/style/docutils.css
index 764652f..6af98af 100644
--- a/static/style/docutils.css
+++ b/static/style/docutils.css
@@ -50,15 +50,18 @@ p.rubric {
   font-style: italic;
 }
 
+
 h1.pagetitle {
   border-bottom: none;
 }
 
+
 h1.title {
   text-align: center;
   font-size: 250%;
   margin-bottom: 0em;
-  border-bottom: 2px solid #aaa;
+  /*border-bottom: 2px solid #aaa;*/
+  border-bottom: none;
 }
 
 h2.subtitle {
@@ -90,6 +93,12 @@ h2 {
   border-bottom: 1px solid #aaa;
 }
 
+h2.pagesubtitle {
+  border-bottom: none;
+  font-size: 100%;
+  text-align: center;
+}
+
 h3 {
   text-align: left;
   font-size: 130%;
@@ -189,3 +198,24 @@ p.sidebar-subtitle {
   font-style: italic;
   color: #003a6b;
 }
+
+.contents {
+    font-size: small;
+    margin-left: 4px;
+    width: 190px;
+    height: 0px;
+    overflow: visible;
+    float: right;
+    position: relative;
+    left: 206px;
+    top: 100px;
+    color: #777777;
+    font-weight: bold;
+    font-size: 12px; }
+.contents a.reference {
+    color: #7777DD; }
+.contents a.reference:visited {
+    color: #7777DD; }
+.contents a.reference:hover {
+    text-decoration: none; }
+