xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

added 1627 caves to 'caves'page

Browse Source
This commit is contained in:
Philip Sargent 2023-05-20 22:47:09 +03:00
parent 2e6b8d44f1
commit 969ed6cce5
2 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/views/caves.py
View File

@ -127,12 +127,14 @@ def caveindex(request):
Cave.objects.all() Cave.objects.all()
caves1623 = list(Cave.objects.filter(area__short_name="1623")) caves1623 = list(Cave.objects.filter(area__short_name="1623"))
caves1626 = list(Cave.objects.filter(area__short_name="1626")) caves1626 = list(Cave.objects.filter(area__short_name="1626"))
caves1627 = list(Cave.objects.filter(area__short_name="1627"))
caves1623.sort(key=caveKey) caves1623.sort(key=caveKey)
caves1626.sort(key=caveKey) caves1626.sort(key=caveKey)
caves1627.sort(key=caveKey)
return render( return render(
request, request,
"caveindex.html", "caveindex.html",
{"caves1623": caves1623, "caves1626": caves1626, "notablecaves": getnotablecaves(), "cavepage": True}, {"caves1623": caves1623, "caves1626": caves1626, "caves1627": caves1627, "notablecaves": getnotablecaves(), "cavepage": True},
) )

62
templates/caveindex.html
View File

@ -11,27 +11,21 @@
<h3>Notable caves</h3> <h3>Notable caves</h3>
<ul> <ul>
{% for cave in notablecaves %} {% 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 %} {% endfor %}
</ul> </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 %} <h3>1623</h3>
</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>
<div style="column-count: 3;"> <div style="column-count: 3;">
<table class="searchable"> <table class="searchable">
{% for cave in caves1623 %} {% for cave in caves1623 %}
@ -50,8 +44,38 @@
</table> </table>
</div> </div>
<p style="text-align:right"> <p style="text-align:right">
<a href="{% url "newcave" %}">New Cave</a><br> <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> <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 %} {% endblock %}