diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-03-31 15:39:53 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-03-31 15:39:53 +0100 |
| commit | 9df91b221b4992d29b90caa30ae5a417d5b750d0 (patch) | |
| tree | dfd69110a1af8ce3442c47f590bb129ee323a3f1 /templates/logbookentry.html | |
| parent | 64a4842dcbcbe10c5edb057c0000659f2809c1f9 (diff) | |
| download | troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.tar.gz troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.tar.bz2 troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.zip | |
Support html and wiki logbook entrys
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
Diffstat (limited to 'templates/logbookentry.html')
| -rw-r--r-- | templates/logbookentry.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index cc1c9f1..0534de9 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -67,7 +67,12 @@ <div id="col1"> <div class="logbookentry"> <b>{{logbookentry.date}}</b> - {{logbookentry.text}}</div> + {% if logbookentry.entry_type == "html" %} + <p>{{logbookentry.text|safe}}</p> + {% else %} + {{logbookentry.text|wiki_to_html}} + {% endif %} + </div> </div> </div> |