1 files changed, 9 insertions, 6 deletions
diff --git a/templates/expedition.html b/templates/expedition.html
index 4f91abd..d208b7d 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -1,16 +1,15 @@
 {% extends "base.html" %}
 {% load wiki_markup %}
+{% load link %}
 
 {% block title %}Expedition {{expedition.name}}{% endblock %}
 {% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
-{% block content %}
-<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
 
-<div id="col2">
+{% block related %}
 <table class="prevnextexpeditions">
 <tr>
-  <td>{% if expedition_prev %}&lt; &lt; <a href="{{ expedition_prev.get_absolute_url }}">{{expedition_prev.year}}</a>{% endif %}</td>
-  <td>{% if expedition_next %}&gt; &gt; <a href="{{ expedition_next.get_absolute_url }}">{{expedition_next.year}}</a>{% endif %}</td>
+  <td>{% if expedition_prev %}&lt; &lt; {{ expedition_prev|link }} {% endif %}</td>
+  <td>{% if expedition_next %}&gt; &gt; {{ expedition_next|link }} {% endif %}</td>
 </tr>
 </ul>
 
@@ -24,7 +23,11 @@
   </tr>
 {% endfor %}
 </table>
-</div>
+{% endblock %}
+
+{% block content %}
+<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
+
 
 <div id="col1">
 <h3>Logbook entries</h3>