summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-12 05:39:30 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-12 05:39:30 +0100
commit9b44731c338a14e45b9a6f757cdaec8bf67db77d (patch)
treefd2bdef20f9db2ac32bab87d73e229ee0f54fab6 /templates
parent5946e159bc7da2ffa757ca528fa1ca6cffa229e1 (diff)
downloadtroggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.tar.gz
troggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.tar.bz2
troggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.zip
[svn] * Fix bugs that were causing broken wikilinks. *Add edit link to mugshots. *make admin url trailing-slash tolerant
Diffstat (limited to 'templates')
-rw-r--r--templates/object_list.html4
-rw-r--r--templates/person.html3
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/object_list.html b/templates/object_list.html
index 4021ad2..7db63e0 100644
--- a/templates/object_list.html
+++ b/templates/object_list.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
{% load link %}
-{% block title %}Troggle: all {{object_list.1.meta.object_name}} objects{%endblock%}
+{% block title %}Troggle: {{object_list.1.meta.object_name}} objects{%endblock%}
{% block contentheader %}
-<h1>All {{object_list.0.object_name}} objects</h1>
+<h1>{{object_list.0.object_name}} objects</h1>
{% endblock contentheader %}
{% block content %}
diff --git a/templates/person.html b/templates/person.html
index adc6aba..2bd4ed3 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -18,7 +18,8 @@
{% if pic.is_mugshot %}
<div class="figure">
<p> <img src="{{ pic.thumbnail_image.url }}" class="thumbnail" />
- <p> {{ pic.caption }}
+ <p> {{ pic.caption }}</p>
+ <p> <a href="{{ pic.get_admin_url }}">edit {{pic}}</a> </>
</p>
</p>
</div>