From 969ed6cce5ff24fe6183d9a3beeda516ff61ad4e Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sat, 20 May 2023 22:47:09 +0300
Subject: [PATCH] added 1627 caves to 'caves'page

---
 core/views/caves.py      |  4 ++-
 templates/caveindex.html | 62 ++++++++++++++++++++++++++++------------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/core/views/caves.py b/core/views/caves.py
index c468362..c3675a5 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -127,12 +127,14 @@ def caveindex(request):
     Cave.objects.all()
     caves1623 = list(Cave.objects.filter(area__short_name="1623"))
     caves1626 = list(Cave.objects.filter(area__short_name="1626"))
+    caves1627 = list(Cave.objects.filter(area__short_name="1627"))
     caves1623.sort(key=caveKey)
     caves1626.sort(key=caveKey)
+    caves1627.sort(key=caveKey)
     return render(
         request,
         "caveindex.html",
-        {"caves1623": caves1623, "caves1626": caves1626, "notablecaves": getnotablecaves(), "cavepage": True},
+        {"caves1623": caves1623, "caves1626": caves1626, "caves1627": caves1627, "notablecaves": getnotablecaves(), "cavepage": True},
     )
 
 
diff --git a/templates/caveindex.html b/templates/caveindex.html
index ec17baf..adb42be 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -11,27 +11,21 @@
 <h3>Notable caves</h3>
 <ul>
 {% for cave in notablecaves %}
-  <li> <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{% endif %} {{cave.official_name|safe}}</a> </li>
+  <li> {{ cave.url|slice:":4" }} <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 %}</td></tr>
 {% endfor %}
 </ul>
 
-<h3>1626</h3>
 
-<div style="column-count: 2;">
-<table class="searchable">
-    {% for cave in caves1626 %}
-    <tr><td><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 %} </td></tr>
   
-  {% endfor %}
-</table>
-</div>
-
-  <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>
- <h3>1623</h3>
-
+<h3>1623</h3>
 <div style="column-count: 3;">
 <table class="searchable">
 {% for cave in caves1623 %}
@@ -50,8 +44,38 @@
 </table>
 </div>
 
-<p style="text-align:right">
-<a href="{% url "newcave" %}">New Cave</a><br>
+    <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>
+
+<h3>1626</h3>
+<div style="column-count: 2;">
+<table class="searchable">
+    {% for cave in caves1626 %}
+    <tr><td><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 %} </td></tr>
+  
+  {% endfor %}
+</table>
+</div>
+
+  <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>
+  </p>
+
+<h3>1627</h3>
+<div style="column-count: 2;">
+<table class="searchable">
+    {% for cave in caves1627 %}
+    <tr><td><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 %} </td></tr>
+  
+  {% endfor %}
+</table>
+</div>
+
+  <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 %}