merge expeditions and statistics pages

templates/core/expedition_list.html

@@ -1,14 +0,0 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-{% load link %}
-
-{% block content %}
-<h1>Expeditions</h1>
-<ul>
-{% for expedition in object_list %}
-    <li>{{ expedition.year }} - <a href="{{ expedition.get_absolute_url }}">{{ expedition.name }}</a></li>
-{% empty %}
-    <li>No articles yet.</li>
-{% endfor %}
-</ul>
-{% endblock %}

templates/core/expeditions_json_list.html

@@ -1,4 +1,5 @@
 {% extends "baseapi.html" %}
 {% block content %}{
-{% for expedition in object_list %}{% if not forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"],{% endif %}{% if forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"]{% endif %}
+{% for expedition in object_list %}{% if not forloop.last %}"{{expedition.year}}": 
+    ["{{expedition.name}}","{{expedition.get_absolute_url}}"],{% endif %}{% if forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"]{% endif %}
 {% endfor %} }{% endblock %}