summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-03-30 17:02:07 +0000
committerSam Wenham <sam@wenhams.co.uk>2019-03-30 17:02:07 +0000
commitc8551991b20dd5d4a70048ea5ca1cbb96d0c3414 (patch)
treea1ee35a80efb0e73ace1bc217de069760396e8f1 /templates
parentf666b9c3963b321296ec51e5d8c8dd149ff60478 (diff)
downloadtroggle-c8551991b20dd5d4a70048ea5ca1cbb96d0c3414.tar.gz
troggle-c8551991b20dd5d4a70048ea5ca1cbb96d0c3414.tar.bz2
troggle-c8551991b20dd5d4a70048ea5ca1cbb96d0c3414.zip
Remove the redundant render_with_context() as django now does this just with the
render() shortcut Move from mimetype to content_type, missed in last commit
Diffstat (limited to 'templates')
-rw-r--r--templates/editcave2.html1
-rw-r--r--templates/logbookentry.html6
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/editcave2.html b/templates/editcave2.html
index 85df6e7..03deeea 100644
--- a/templates/editcave2.html
+++ b/templates/editcave2.html
@@ -9,6 +9,7 @@
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
{% endblock %}
{% block content %}
+<h1>Edit Cave</h1>
<form action="" method="post">{% csrf_token %}
<table>{{ form }}{{caveAndEntranceFormSet}}</table>
{{ versionControlForm }}
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 2b60996..cc1c9f1 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -65,9 +65,9 @@
</div>
<div id="col1">
-<div class="logbookentry">
-<b>{{logbookentry.date}}</b>
- {{logbookentry.text|wiki_to_html}}</div>
+ <div class="logbookentry">
+ <b>{{logbookentry.date}}</b>
+ {{logbookentry.text}}</div>
</div>
</div>