diff options
| -rw-r--r-- | templates/logbookentry.html | 2 | ||||
| -rw-r--r-- | templates/logbookform.html | 3 | ||||
| -rw-r--r-- | templates/logreport.html | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 3d1a49e..657268c 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -10,6 +10,7 @@ <div id="related"> <p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a> <a href="/years/{{logbookentry.expedition.year}}/{{logbookentry.expedition.logbookfile}}">Full logbook</a> + <a href="/logreport/{{expedition.year}}">Expo logbook report</a> </p> {% if logbookentry.cave %} @@ -74,6 +75,7 @@ th, td { <p>{{logbookentry.text|safe}}</p> </div> <p><a href="/logbookedit/{{logbookentry.slug|safe}}">Edit this entry</a>. + </div> </div> diff --git a/templates/logbookform.html b/templates/logbookform.html index da90dc7..11550d5 100644 --- a/templates/logbookform.html +++ b/templates/logbookform.html @@ -92,7 +92,8 @@ <br /><br /><br /> {% if date %}<p>Link to <em><a href="/logbookentry/{{date}}/{{slug}}#">this entry</a></em> {% endif %} - Full logbook for this year: <a href="/years/{{year}}/logbook.html"><em>Logbook {{year}}</em></a> + Full logbook: <a href="/years/{{year}}/logbook.html"><em>Logbook {{year}}</em></a> + {{year}} <a href="/logreport/{{year}}">Logbook report</a> </div> diff --git a/templates/logreport.html b/templates/logreport.html index a8df633..a131146 100644 --- a/templates/logreport.html +++ b/templates/logreport.html @@ -20,7 +20,7 @@ <table class="expeditionlogbooks"> -<tr><th>Date</th><th>Logged trips and diary entries</th><th>Cave</th><th>Text..</th><th>Author</th><th>Who else</th></tr> +<tr><th>Date</th><th>Logged trips and diary entries</th><th>Cave</th><th>Text..</th><th>Words</th><th>Author</th><th>Who else</th></tr> {% regroup dateditems|dictsort:"date" by date as dates %} {% for date in dates %} {% for entry in date.list %} @@ -39,6 +39,9 @@ <td> {{entry.text|striptags|safe|truncatechars:30}} </td> +<td> +<div align="right">{{entry.text|wordcount}}</div> +</td> <td> <a href="/personexpedition/{{entry.author.personexpedition.person}}/{{year}}">{{entry.author.nickname_used}}</a> </td> |