Fix to /caves/ != /caves

templates/caveindex.html

@@ -15,7 +15,20 @@
 {% endfor %}
 </ul>
 
-<h3>1623</h3>
+<h3>1626</h3>
+
+<ul class="searchable">
+ {% for cave in caves1626 %}
+  
+    <li>  <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %}
+   </li>
+  
+  {% endfor %}
+  </ul>
+  <p style="text-align:right">
+    <a href="{% url "newcave" %}">New Cave</a>
+  </p>
+ <h3>1623</h3>
 
 <table class="searchable">
 {% for cave in caves1623 %}
@@ -25,17 +38,7 @@
 {% endfor %}
 </table>
 
-<h3>1626</h3>
-
-<ul class="searchable">
-{% for cave in caves1626 %}
-
-  <li>  <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %}
- </li>
-
-{% endfor %}
-</ul>
-
+<p style="text-align:right">
 <a href="{% url "newcave" %}">New Cave</a>
-
+</p>
 {% endblock %}

templates/expowebbase.html

@@ -12,7 +12,7 @@
 <li><a href="/index.htm">Expo website home</a></li>
 <li><a href="/intro.html">Introduction</a></li>
 <li><a href="/infodx.htm">Main index</a></li>
-<li><a href="/caves/">Cave index</a></li>
+<li><a href="/caves">Cave index</a></li>
 {% if cavepage %}
 <ul>
 <li><a href="{% url "survexcaveslist" %}">All Survex</a></li>

templates/menu.html

@@ -5,7 +5,7 @@
 <li><a href="/handbook/index.htm">Handbook</a></li>
 <li><a href="/pubs.htm">Reports</a></li>
 <li><a href="/areas.htm">Areas</a></li>
-<li><a href="/caves/">Caves</a></li>
+<li><a href="/caves">Caves</a></li>
 <li><a href="/expedition/2019">Troggle</a></li>
 <li><form name=P method=get action="/search" target="_top">
     <input id="omega-autofocus" type=search name=P value="testing" size=8 autofocus>

urls.py

@@ -25,7 +25,7 @@ actualurlpatterns = patterns('',
     url(r'^troggle$',            views_other.frontpage,      name="frontpage"),
     url(r'^todo/$',              views_other.todo,      name="todo"),
     
-    url(r'^caves/?$',    views_caves.caveindex,      name="caveindex"),
+    url(r'^caves$',    views_caves.caveindex,      name="caveindex"),
     url(r'^people/?$',   views_logbooks.personindex, name="personindex"),
 
     url(r'^newqmnumber/?$',              views_other.ajax_QM_number,  ),