diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/expedition.html | 6 | ||||
| -rw-r--r-- | templates/logbook2005style.html | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/templates/expedition.html b/templates/expedition.html index debaf64..edea06b 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -68,10 +68,10 @@ an "S" for a survey trip. The colours are the same for people on the same trip. <form action="" method="GET"><input type="submit" name="reload" value="Reload from logbook"></form> {% endif %} -<h3 id="trips">Logbooks and survey trips per day</h3> +<h3 id="trips"> {{expedition.name}} - Records per day</h3> <table class="expeditionlogbooks"> -<tr><th>Date</th><th>Logged trips</th><th>Surveys</th><th>Wallets</th></tr> +<tr><th>Date</th><th>Logged trips and diary entries</th><th>Surveys</th><th>Wallets</th></tr> {% regroup dateditems|dictsort:"date" by date as dates %} {% for date in dates %} <tr> @@ -89,5 +89,5 @@ an "S" for a survey trip. The colours are the same for people on the same trip. {% endfor %}</td></tr> {% endfor %} </table> - +<h3> {{expedition.name}} </h3> {% endblock %} diff --git a/templates/logbook2005style.html b/templates/logbook2005style.html index 5ee94ad..7831175 100644 --- a/templates/logbook2005style.html +++ b/templates/logbook2005style.html @@ -20,11 +20,11 @@ Exported on {% now 'Y-m-d D' %} using control panel webpage and exportlogbook() <hr /> <div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div> -<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person}}</u>{% else %}{{ persontrip.personexpedition.person }}{% endif %}, {% endfor %}</div> -<div class="triptitle">{{logbook_entry.title}}</div> +<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person|safe}}</u>{% else %}{{ persontrip.personexpedition.person|safe }}{% endif %}, {% endfor %}</div> +<div class="triptitle">{{logbook_entry.title|safe}}</div> {{logbook_entry.text|safe}} -<div class="timeug">T/U: {{logbook_entry.time_underground}}</div> +<div class="timeug">T/U: {{logbook_entry.time_underground|safe}} hours</div> {% endfor %} <hr /> </body> |