aboutsummaryrefslogtreecommitdiffstats
path: root/bn_django
diff options
context:
space:
mode:
Diffstat (limited to 'bn_django')
-rw-r--r--bn_django/git_wiki/templates/git_wiki/commit.html2
-rw-r--r--bn_django/photos/templates/photos/photo_detail.html4
-rw-r--r--bn_django/templates/newcomments_table2
3 files changed, 4 insertions, 4 deletions
diff --git a/bn_django/git_wiki/templates/git_wiki/commit.html b/bn_django/git_wiki/templates/git_wiki/commit.html
index 82aace4..e99d553 100644
--- a/bn_django/git_wiki/templates/git_wiki/commit.html
+++ b/bn_django/git_wiki/templates/git_wiki/commit.html
@@ -28,7 +28,7 @@
<b>Committer Date: </b>
{{ commit.committer_date }}<br />
{% if commit.pretty_diff %}
- <pre class="large">{{ commit.pretty_diff}}</pre>
+ <pre class="large">{{ commit.pretty_diff|safe}}</pre>
{% else %}
{% if commit.rawdiff %}
<pre class="large">{{ commit.rawdiff }}</pre>
diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index 1278bda..121c36c 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -62,10 +62,10 @@ by {{ object.photographer }}.</p>
alt="{{ object.title }}" />
</a>
<div>
- <p class="photodesc"> {{ object.desc }} </p>
+ <p class="photodesc"> {{ object.desc|safe }} </p>
{% if object.extra %}
<h3 class="photoextra">More information</h3>
- <p class="photoextra">{{ object.extra }}</p>
+ <p class="photoextra">{{ object.extra|safe }}</p>
{% endif %}
</div>
</div>
diff --git a/bn_django/templates/newcomments_table b/bn_django/templates/newcomments_table
index ab50b7c..2349dd0 100644
--- a/bn_django/templates/newcomments_table
+++ b/bn_django/templates/newcomments_table
@@ -5,7 +5,7 @@
{{ c.submit_date|date:"F jS" }}</td>
<td class="description">
{% if c.user.username %}{{ c.user.username }}
- {% else %}c.user_name{% endif%} </td>
+ {% else %}{{c.user_name}}{% endif%} </td>
<td class="description">
<a href="{{c.get_content_object_url}}">
{{ c.content_type.name }}</a></td>