3 files changed, 50 insertions, 4 deletions
diff --git a/templates/expedition.html b/templates/expedition.html
index 72fec15..bcbed62 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -18,7 +18,7 @@
 <tr><th>Caver</th><th>From</th><th>To</th></tr>
 {% for personexpedition in expedition.personexpedition_set.all %}
   <tr>
-    <td><a href="{% url person personexpedition.person.href%}">{{personexpedition.person}}</a></td>
+    <td><a href="{% url personexpedition personexpedition.person.href personexpedition.expedition.year%}">{{personexpedition.person}}</a></td>
     <td>{{personexpedition.date_from}}</td>
     <td>{{personexpedition.date_to}}</td>
   </tr>
@@ -36,7 +36,7 @@
 {% for logbookentry in logbookentries %}
   <tr>
     <td>{{logbookentry.date}}</td>
-    <td><a href="{% url logbookentry logbookentry.id %}">{{logbookentry.title|safe}}</td>
+    <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</td>
     <td><a href="{% url person logbookentry.author.person.href%}">{{logbookentry.author.name}}</a></td>
     <td>{{logbookentry.place}}</td>
   </tr>
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 4a0dd61..6ed9b32 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -10,12 +10,22 @@
 <p><a href="{% url expedition logbookentry.expedition.year %}">{{logbookentry.expedition.name}}</a></p>
 <p>place: {{logbookentry.place}}</p>
 
+<p>
+  {% if logbookentry.logbookentry_prev %}
+    <a href="{% url logbookentry logbookentry.logbookentry_prev.href %}">{{logbookentry.logbookentry_prev.date}}</a>
+  {% endif %}
+  {% if logbookentry.logbookentry_next %}
+    <a href="{% url logbookentry logbookentry.logbookentry_next.href %}">{{logbookentry.logbookentry_next.date}}</a>
+  {% endif %}
+</p>
+
 <table class="cavers">
 <tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
 {% for persontrip in logbookentry.persontrip_set.all %}
 <tr>
   {% ifequal persontrip.person_expedition logbookentry.author %}
     <td class="author">
+{{persontrip.person_expedition.person.personrole_set.count}}
   {% else %}
     <td>
   {% endifequal %}
@@ -30,12 +40,12 @@
 
   <td>
   {% if persontrip.persontrip_prev %}
-    <a href="{% url logbookentry persontrip.persontrip_prev.logbook_entry.id %}">{{persontrip.persontrip_prev.date}}</a>
+    <a href="{% url logbookentry persontrip.persontrip_prev.logbook_entry.href %}">{{persontrip.persontrip_prev.date}}</a>
   {% endif %}
   </td>
   <td>
   {% if persontrip.persontrip_next %}
-     <a href="{% url logbookentry persontrip.persontrip_next.logbook_entry.id %}">{{persontrip.persontrip_next.date}}</a>
+     <a href="{% url logbookentry persontrip.persontrip_next.logbook_entry.href %}">{{persontrip.persontrip_next.date}}</a>
   {% endif %}
   </td>
 </tr>
diff --git a/templates/personexpedition.html b/templates/personexpedition.html
new file mode 100644
index 0000000..91c618a
--- /dev/null
+++ b/templates/personexpedition.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% load wiki_markup %}
+
+{% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
+
+
+{% block content %}
+<h2>{{personexpedition.person}}: {{personexpedition.expedition}} ({{personexpedition.date_from}} - {{personexpedition.date_to}})</h2>
+
+<div id="col2">
+<table class="survexcontibutions">
+<tr><th>Date</th><th>Place</th><th>Role</th></tr>
+{% for personrole in personexpedition.personrole_set.all %}
+  <tr>
+    <td>{{personrole.survex_block.start_month}}</td>
+    <td>{{personrole.survex_block.name}}</td>
+    <td>{{personrole.role}}</td>
+  </tr>
+{% endfor %}
+</table>
+</div>
+
+<div id="col1">
+<table class="expeditionlogbooks">
+<tr><th>Date</th><th>Title</th><th>Place</th></tr>
+{% for persontrip in personexpedition.persontrip_set.all %}
+  <tr>
+    <td>{{persontrip.date}}</td>
+    <td><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</td>
+    <td>{{persontrip.place}}</td>
+  </tr>
+{% endfor %}
+</table>
+</div>
+
+{% endblock %}