More links

templates/logbookentry.html

@@ -10,6 +10,7 @@
 <div id="related">
 <p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="/years/{{logbookentry.expedition.year}}/{{logbookentry.expedition.logbookfile}}">Full logbook</a>
+&nbsp;&nbsp;&nbsp;&nbsp;<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>
 

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> &nbsp;&nbsp;{% 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>
+&nbsp;&nbsp;&nbsp;&nbsp;{{year}} <a href="/logreport/{{year}}">Logbook report</a>
 			
  
 </div>

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}}&nbsp;
         </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>