aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@manus.(none)>2007-02-24 16:51:49 -0800
committerbnewbold <bnewbold@manus.(none)>2007-02-24 16:51:49 -0800
commit2f81eff5ea7c0c13ab3028cee35b591f56d76e2a (patch)
treeb762ba34f8e43d4b8ea0b4af72ed0e1bce6ed4cc
parentb1e0b3ec561ef4e3ae26df2419ba2ed7170e000a (diff)
downloadbnewnet-2f81eff5ea7c0c13ab3028cee35b591f56d76e2a.tar.gz
bnewnet-2f81eff5ea7c0c13ab3028cee35b591f56d76e2a.zip
added restructured text processing, fixed path bug in knowledge
-rw-r--r--bn_django/git_wiki/templates/git_wiki/base.html3
-rw-r--r--bn_django/git_wiki/templates/git_wiki/item.html4
-rw-r--r--bn_django/settings.py1
3 files changed, 5 insertions, 3 deletions
diff --git a/bn_django/git_wiki/templates/git_wiki/base.html b/bn_django/git_wiki/templates/git_wiki/base.html
index 526a707..eefaa9a 100644
--- a/bn_django/git_wiki/templates/git_wiki/base.html
+++ b/bn_django/git_wiki/templates/git_wiki/base.html
@@ -11,9 +11,6 @@
{% block path %}
{{ block.super }}
<a href="/knowledge">knowledge</a>
-{% if item %}
- &raquo; <a href="/k/{{ item.slug }}/">{{ object.title }}</a>
-{% endif %}
{% endblock %}
{% block title %}
diff --git a/bn_django/git_wiki/templates/git_wiki/item.html b/bn_django/git_wiki/templates/git_wiki/item.html
index 0df1b72..7562fc6 100644
--- a/bn_django/git_wiki/templates/git_wiki/item.html
+++ b/bn_django/git_wiki/templates/git_wiki/item.html
@@ -1,11 +1,15 @@
{% extends "git_wiki/base.html" %}
+{% load markup %}
+
{% block path %}{{ block.super }} &raquo; <a href="/k/{{ item.slug }}/">
{{ item.path }}</a>{% endblock %}
{% block title %}Knowledge Item: {{ item.path }}{% endblock %}
{% block gitwiki %}
+ {{ item.contents|restructuredtext }}
+ <br /><hr />
<h3>Item name:</h3>
<span class="hash">{{ item.name }}</span>
<h3>Item sha1 hash:</h3>
diff --git a/bn_django/settings.py b/bn_django/settings.py
index 4e6c1b0..55444f7 100644
--- a/bn_django/settings.py
+++ b/bn_django/settings.py
@@ -80,6 +80,7 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.flatpages',
+ 'django.contrib.markup',
'bn_django.photos',
'bn_django.git_wiki',
'bn_django.git_browse',