From 0135d47536dff8e8cf83dbe1965588759bfcf365 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Thu, 24 Jul 2025 16:06:42 +0200
Subject: [PATCH] tidied format of caves index page

---
 templates/caveindex.html        | 135 ++------------------------------
 templates/cavelist_columns.html |  25 ++++++
 templates/entranceindex.html    |   2 +-
 3 files changed, 34 insertions(+), 128 deletions(-)
 create mode 100644 templates/cavelist_columns.html

diff --git a/templates/caveindex.html b/templates/caveindex.html
index bb6fff1..e522ada 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -34,36 +34,13 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
         <a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
     </p>
 
+
+
 <h3>This year's caves</h3>
 <div style="column-count: 3;">
 <table class="searchable">
 {% for cave in caves_this_year %}
-  <tr><td> <a href="/{{ cave.url }}">
-      {% if cave.kataster_number %}
-          {{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> 
-          {% if cave.unofficial_number %}
-              ({{cave.unofficial_number }})
-          {% endif %}
-      {% else %}
-          {{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> 
-      {% endif %}
-      {% if cave.filename %}
-	{% if cave.entrances %}
-		{% if cave.no_location %}<span title="the cave has an Entrance, but no entrances have located survey station" style="color: black">&#x25B2;</span>{% endif %}
-	{% else %}<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
-	{% endif %}
-      {% else %}<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
-      {% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
-
-      {% endif %}
-  </td></tr>
-
+	{% include 'cavelist_columns.html' %}
 {% endfor %}
 </table>
 </div>
@@ -72,32 +49,7 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
 <div style="column-count: 3;">
 <table class="searchable">
 {% for cave in caves_last_year %}
-  <tr><td> <a href="/{{ cave.url }}">
-      {% if cave.kataster_number %}
-          {{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> 
-          {% if cave.unofficial_number %}
-              ({{cave.unofficial_number }})
-          {% endif %}
-      {% else %}
-          {{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> 
-      {% endif %}
-      {% if cave.filename %}
-	{% if cave.entrances %}
-		{% if cave.no_location %}<span title="the cave has an Entrance, but no entrances have located survey station" style="color: black">&#x25B2;</span>{% endif %}
-	{% else %}<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
-	{% endif %}
-      {% else %}<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
-      {% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
-
-      {% endif %}
-  </td></tr>
-
+	{% include 'cavelist_columns.html' %}
 {% endfor %}
 </table>
 </div>
@@ -106,32 +58,7 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
 <div style="column-count: 3;">
 <table class="searchable">
 {% for cave in caves1623 %}
-  <tr><td> <a href="/{{ cave.url }}">
-      {% if cave.kataster_number %}
-          {{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> 
-          {% if cave.unofficial_number %}
-              ({{cave.unofficial_number }})
-          {% endif %}
-      {% else %}
-          {{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> 
-      {% endif %}
-      {% if cave.filename %}
-	{% if cave.entrances %}
-		{% if cave.no_location %}<span title="the cave has an Entrance, but no entrances have located survey station" style="color: black">&#x25B2;</span>{% endif %}
-	{% else %}<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
-	{% endif %}
-      {% else %}<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
-      {% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
-
-      {% endif %}
-  </td></tr>
-
+	{% include 'cavelist_columns.html' %}
 {% endfor %}
 </table>
 </div>
@@ -145,23 +72,7 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
 <div style="column-count: 3;">
 <table class="searchable">
     {% for cave in caves1626 %}
-    <tr><td><a href="/{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> {% endif %}
-      {% if cave.filename %}
-	{% if cave.entrances %}
-		{% if cave.no_location %}<span style="color: black">&#x25B2;</span>{% endif %}
-	{% else %}<span style="color: orange">&#x25B2;</span>
-	{% endif %}
-	{% else %}<span style="color: #43C6DB">&#x25BC;</span>
-	{% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
-
-      {% endif %}  </td></tr>
-  
+	{% include 'cavelist_columns.html' %}
   {% endfor %}
 </table>
 </div>
@@ -176,22 +87,7 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
 <div style="column-count: 3;">
 <table class="searchable">
     {% for cave in caves1627 %}
-    <tr><td><a href="/{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> {% endif %} 
-      {% if cave.filename %}
-		{% if cave.no_location %}<span style="color: black">&#x25B2;</span>{% endif %}
-	{% if cave.entrances %}
-	{% else %}<span style="color: orange">&#x25B2;</span>
-	{% endif %}
-      {% else %}<span style="color: #43C6DB">&#x25BC;</span>
-      {% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
-
-      {% endif %}  </td></tr>
+	{% include 'cavelist_columns.html' %}
  {% endfor %}
 </table>
 </div>
@@ -205,23 +101,8 @@ Black triangle <span style="color: black">&#x25B2;</span> against a name indicat
 <div style="column-count: 3;">
 <table class="searchable">
     {% for cave in caves1624 %}
-    <tr><td><a href="/{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> {% endif %} 
-      {% if cave.filename %}
-		{% if cave.no_location %}<span  style="color: black">&#x25B2;</span>{% endif %}
-	{% if cave.entrances %}
-	{% else %}<span style="color: orange">&#x25B2;</span>
-	{% endif %}
-      {% else %}<span style="color: #43C6DB">&#x25BC;</span>
-      {% endif %}
-      {% if cave.survex_file %}{% else %}
-          {% if cave.fully_explored %}
-             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
-          {% else %}
-             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
-          {% endif %}
+ 	{% include 'cavelist_columns.html' %}
 
-      {% endif %}  </td></tr>
-  
   {% endfor %}
 </table>
 
diff --git a/templates/cavelist_columns.html b/templates/cavelist_columns.html
new file mode 100644
index 0000000..79cd7cb
--- /dev/null
+++ b/templates/cavelist_columns.html
@@ -0,0 +1,25 @@
+ <tr><td> <a href="/{{ cave.url }}">
+      {% if cave.kataster_number %}
+          {{ cave.kataster_number }} <em>{{cave.official_name|safe}}</em></a> 
+          {% if cave.unofficial_number %}
+              ({{cave.unofficial_number }})
+          {% endif %}
+      {% else %}
+          {{cave.unofficial_number }} <em>{{cave.official_name|safe}}</em></a> 
+      {% endif %}
+      {% if cave.filename %}
+	{% if cave.entrances %}
+		{% if cave.no_location %}<span title="the cave has an Entrance, but no entrances have located survey station" style="color: black">&#x25B2;</span>{% endif %}
+	{% else %}<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
+	{% endif %}
+      {% else %}<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
+      {% endif %}
+      {% if cave.survex_file %}{% else %}
+          {% if cave.fully_explored %}
+             	<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
+          {% else %}
+             	<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
+          {% endif %}
+
+      {% endif %}
+  </td></tr>
diff --git a/templates/entranceindex.html b/templates/entranceindex.html
index 3830b8e..92d8d44 100644
--- a/templates/entranceindex.html
+++ b/templates/entranceindex.html
@@ -7,7 +7,7 @@
 
 <h1>Entrance Index</h1>
 
-{% for entrance in entrances %}{% if entrance.lat_wgs84 %}<a href="{{ entrance.firstcave.url }}">{{ entrance }}</a> has "floating" lat/long <em>{{entrance.lat_wgs84}} N, {{entrance.long_wgs84}} E</em> instead of having a proper tag station or other station<br />{% endif %}{% endfor %}
+{% for entrance in entrances %}{% if entrance.lat_wgs84 %}<a href="{{ entrance.firstcave.url }}">{{ entrance }}</a> has "floating" lat/long <em>{{entrance.lat_wgs84}} N, {{entrance.long_wgs84}} E</em> [instead of/as well as] having a proper tag station or other station<br />{% endif %}{% endfor %}
 <p>
 <table>
 <theader>