summaryrefslogtreecommitdiffstats
path: root/templates/logbookentry.html
diff options
context:
space:
mode:
authorWookey <wookey@wookware.org>2019-04-02 00:57:54 +0100
committerWookey <wookey@wookware.org>2019-04-02 00:57:54 +0100
commitb3089fafe99d4fffc9ee96ad1a8d70d0dd242f80 (patch)
tree9c6bb4a4530824c8e072984a0346509298188030 /templates/logbookentry.html
parente913a56a6be2e2d90ba0c6f882416acbd8e3e2a2 (diff)
parent39c61bd526ecaff42650efcd011548aa9dac6900 (diff)
downloadtroggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.gz
troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.bz2
troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.zip
Merge lots of troggle fixes
Diffstat (limited to 'templates/logbookentry.html')
-rw-r--r--templates/logbookentry.html11
1 files changed, 8 insertions, 3 deletions
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>