diff options
| author | Wookey <wookey@wookware.org> | 2019-04-02 00:57:54 +0100 |
|---|---|---|
| committer | Wookey <wookey@wookware.org> | 2019-04-02 00:57:54 +0100 |
| commit | c4301cf6df56ba1bef4f2c908b949a2b45ea65dc (patch) | |
| tree | 9c6bb4a4530824c8e072984a0346509298188030 /templates | |
| parent | de7d68b1eb70542f66092cb0048af3d096e6980c (diff) | |
| parent | bb8dbb381fe87c3a63e9586a1bf1e993b09c965b (diff) | |
| download | troggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.tar.gz troggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.tar.bz2 troggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.zip | |
Merge lots of troggle fixes
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> |