diff options
Diffstat (limited to 'templates/logbookentry.html')
| -rw-r--r-- | templates/logbookentry.html | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 1af88bd..9407e72 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +<!-- logbookentry.html - this text visible because this template has been included --> {% load wiki_markup %} {% block title %}Logbook {{logbookentry.id}}{% endblock %} @@ -10,12 +11,14 @@ <h2>{{logbookentry.title|safe}}</h2> <div id="related"> -<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p> +<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a> + <a href="/years/{{logbookentry.expedition.logbookfile}}">Full logbook</a> +</p> {% if logbookentry.cave %} <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p> {% else %} - <p>{{logbookentry.place}}</p> + <p>{{logbookentry.place|safe}}</p> {% endif %} <p> @@ -67,16 +70,9 @@ <div id="col1"> <div class="logbookentry"> <b>{{logbookentry.date|date:"D d M Y"}}</b> - {% if logbookentry.entry_type == "html" %} - <p>{{logbookentry.text|safe}}</p> - {% else %} - {{logbookentry.text|wiki_to_html}} - {% endif %} + <p>{{logbookentry.text|safe}}</p> </div> </div> </div> -{% if logbookentry.filename %}<a href="{% url "editLogBookEntry" expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url "deleteLogBookEntry" expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%} - - {% endblock %} |