diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editcave2.html | 1 | ||||
| -rw-r--r-- | templates/frontpage.html | 2 | ||||
| -rw-r--r-- | templates/logbookentry.html | 11 |
3 files changed, 10 insertions, 4 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/frontpage.html b/templates/frontpage.html index 28206b6..eed6098 100644 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -16,7 +16,7 @@ {% if entry.is_deletion %} {{ entry.object_repr }} {% else %} - <a href="admin/{{ entry.get_admin_url }}">{{ entry.object_repr }}</a> + <a href="admin/{{ entry.get_admin_url }}/">{{ entry.object_repr }}</a> {% endif %} <br/> {% if entry.content_type %} diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 2b60996..0534de9 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -65,9 +65,14 @@ </div> <div id="col1"> -<div class="logbookentry"> -<b>{{logbookentry.date}}</b> - {{logbookentry.text|wiki_to_html}}</div> + <div class="logbookentry"> + <b>{{logbookentry.date}}</b> + {% if logbookentry.entry_type == "html" %} + <p>{{logbookentry.text|safe}}</p> + {% else %} + {{logbookentry.text|wiki_to_html}} + {% endif %} + </div> </div> </div> |