diff --git a/core/views/caves.py b/core/views/caves.py index dcd199d..a415448 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -205,6 +205,24 @@ def getnotablecaves(): print(notablecaves) return notablecaves +def caves_undropped(request): + caves1623 = list(Cave.objects.filter(areacode="1623",unexplored="True")) + caves1626 = list(Cave.objects.filter(areacode="1626",unexplored="True")) + + caves1623.sort(key=caveKey) + caves1626.sort(key=caveKey) + + + allcaves = caves1623 + caves1626 + + return render( + request, + "cavesundropped.html", + {"caves1623": caves1623, + "caves1626": caves1626, + "cavepage": True, "year": current_expo()}, + ) + def caves_recent(request): caves1623 = list(Cave.objects.filter(areacode="1623")) caves1626 = list(Cave.objects.filter(areacode="1626")) diff --git a/templates/caveindex.html b/templates/caveindex.html index 44411cc..78c7a4d 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -22,7 +22,8 @@ {% include 'cave_red_star.html' %}

-See All Caves for all the caves in areas 1623, 1626, 1624, 1627 +See All Caves for all the caves in areas 1623, 1626, 1624, 1627
+See Undropped Caves for all unexplored caves

New Cave
diff --git a/templates/cavesallindex - Copy.html:Zone.Identifier b/templates/cavesallindex - Copy.html:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/templates/cavesallindex.html b/templates/cavesallindex.html index 228e1ed..4a881f3 100644 --- a/templates/cavesallindex.html +++ b/templates/cavesallindex.html @@ -22,7 +22,8 @@ {% include 'cave_red_star.html' %} -

Go to Recent Caves for a shorter list of recent caves. +

See Undropped Caves for all unexplored caves
+See Recent Caves for a shorter list of recent caves.

New Cave
diff --git a/templates/cavesundropped.html b/templates/cavesundropped.html new file mode 100644 index 0000000..bea81d8 --- /dev/null +++ b/templates/cavesundropped.html @@ -0,0 +1,40 @@ +{% extends "cavebase.html" %} + +{% block title %}Undescended Caves{% endblock %} + +{% block content %} + +

Undescended Caves

+ +{% include 'cave_red_star.html' %} + +

+See All Caves for all the caves in areas 1623, 1626, 1624, 1627
+See Recent Caves for a full list of recent caves. + +

+ New Cave
+ Cave Number Index - kept updated +

+ +

1623

+
+ +{% for cave in caves1623 %} + {% include 'cavelist_columns.html' %} +{% endfor %} + +
+ + +

1626

+
+ + {% for cave in caves1626 %} + {% include 'cavelist_columns.html' %} + {% endfor %} + +
+ + +{% endblock %} diff --git a/urls.py b/urls.py index bf7ba71..0896187 100644 --- a/urls.py +++ b/urls.py @@ -11,6 +11,7 @@ from troggle.core.views.caves import ( cave3d, cave_debug, caves_recent, + caves_undropped, cavesall, cavepage, caveQMs, @@ -159,6 +160,7 @@ trogglepatterns = [ path('folk_export', folk_export, name="folk_export"), path('caveslist', caveslist, name="caveslist"), path('caves_recent', caves_recent, name="caves_recent"), + path('caves_undropped', caves_undropped, name="caves_undropped"), path('entrances', entranceindex, name="entranceindex"), path('enttags', entrancetags, name="entrancetags"),