restored original url /caves to point ot all caves

core/views/caves.py

@@ -205,7 +205,7 @@ def getnotablecaves():
     print(notablecaves)
     return notablecaves
 
-def caveindex(request):
+def caves_recent(request):
     caves1623 = list(Cave.objects.filter(areacode="1623"))
     caves1626 = list(Cave.objects.filter(areacode="1626"))
     caves1623.sort(key=caveKey)

templates/caveindex.html

@@ -22,11 +22,11 @@
 
 {% include 'cave_red_star.html' %}
 <p>
-See <em><a href="/cavesall">All Caves</a></em> for all the caves in areas 1623, 1626, 1624, 1627 
+See <em><a href="/caves">All Caves</a></em> for all the caves in areas 1623, 1626, 1624, 1627 
 
     <p style="text-align:right">
     <a href="{% url "newcave" %}">New Cave</a><br>
-        <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
+     
     </p>
 
 
@@ -56,6 +56,6 @@ See <em><a href="/cavesall">All Caves</a></em> for all the caves in areas 1623,
  
   <p style="text-align:right">
     <a href="{% url "newcave" %}">New Cave</a><br>
-    <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
+  
   </p>
 {% endblock %}

templates/cavesallindex.html

@@ -22,7 +22,7 @@
 
 {% include 'cave_red_star.html' %}
 
-<p>Go to <a href="/caves">Recent Caves</a> for a shorter list of recent caves.
+<p>Go to <a href="/caves_recent">Recent Caves</a> for a shorter list of recent caves.
 
     <p style="text-align:right">
     <a href="{% url "newcave" %}">New Cave</a><br>

templates/menu.html

@@ -22,7 +22,7 @@
 <li><a href="/handbook/logbooks.html#form">Make Logbook Entry</a></li>
 
 
-<li><a href="/caves">Caves</a>
+<li><a href="/caves_recent">Caves</a>
 {% if parent_caves %}
 <ul>
 {% for parent_cave in parent_caves %}

templates/troggletoolbar.html

@@ -23,7 +23,7 @@
 <div class="toolbarlinks">
 {% endif %}
     <a href="/logbookedit/">Logbook Entry</a> |
-    <a id="cavesLink" href="/caves">Caves</a>  |
+    <a id="cavesLink" href="/caves_recent">Caves</a>  |
     <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
     <a href="/survexfile">Survex</a> |
     <a href="{% url "survexcaveslist" %}">All Survex</a> |

urls.py

@@ -10,7 +10,7 @@ from troggle.core.views.auth import expologin, expologout
 from troggle.core.views.caves import (
     cave3d,
     cave_debug,
-    caveindex,
+    caves_recent,
     cavesall,
     cavepage,
     caveQMs,
@@ -152,13 +152,13 @@ trogglepatterns = [
 
     re_path(r'^(.*)_edit_edit$',    spider, name="spider"), # web spider. Intercept and manage it.
 
-    re_path(r'^caves$',      caveindex,      name="caveindex"),
-    re_path(r'^indxal.htm$', caveindex,      name="caveindex"), # ~420 hrefs to this url in expoweb files
+    re_path(r'^caves$',      cavesall,      name="cavesall"),
+    re_path(r'^indxal.htm$', cavesall,      name="cavesall"), # ~420 hrefs to this url in expoweb files
     re_path(r'^people/?$',   notablepersons, name="notablepersons"),
     path('people_ids',   people_ids, name="people_ids"),
     path('folk_export',   folk_export, name="folk_export"),
     path('caveslist',        caveslist,      name="caveslist"),
-    path('cavesall',        cavesall,      name="cavesall"),
+    path('caves_recent',        caves_recent,      name="caves_recent"),
 
     path('entrances',      entranceindex,      name="entranceindex"),
     path('enttags',      entrancetags,      name="entrancetags"),