Nicknames preserved, date checked

templates/logbookentry.html

@@ -27,6 +27,12 @@
   {% endif %}
 </p>
 
+<style>
+th, td {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+</style>
 <table class="cavers">
 <tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
 {% for personlogentry in logbookentry.personlogentry_set.all %}
@@ -36,7 +42,7 @@
   {% else %}
     <td>
   {% endif %}
-  <a href="{{ personlogentry.personexpedition.get_absolute_url }}">{{personlogentry.personexpedition.person}}</a>
+  <a href="{{ personlogentry.personexpedition.get_absolute_url }}">{{personlogentry.nickname_used}} ({{personlogentry.personexpedition.person}})</a>
   </td>
   
   <td>
@@ -64,7 +70,7 @@
 <div id="col1">
   <div class="logbookentry">
     <b>{{logbookentry.date|date:"D d M Y"}}</b>
-    {% for personlogentry in logbookentry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.personexpedition.person}}{% endif %}{% endfor %}
+    {% for personlogentry in logbookentry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.nickname_used}} {% endif %}{% endfor %}
     <p>{{logbookentry.text|safe}}</p>
   </div>
   <p><a href="/logbookedit/{{logbookentry.slug|safe}}">Edit this entry</a>.