mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2025-04-03 09:21:48 +01:00
formatting
This commit is contained in:
parent
9d6552ea22
commit
47db19f1a2
@ -174,8 +174,8 @@ def do_ARGE_cave(slug, caveid, url, areacode, svxid):
|
|||||||
|
|
||||||
cave = Cave(
|
cave = Cave(
|
||||||
underground_description="ARGE cave.",
|
underground_description="ARGE cave.",
|
||||||
survex_file= f"{svxid}.svx",
|
survex_file= f"{svxid}.svx", # or is this svxurl ?!
|
||||||
url=url,
|
# url=url, No, the url spplied is that of the survexfile not of the cave file, e.g. /1626/254/254
|
||||||
notes=default_note,
|
notes=default_note,
|
||||||
areacode=areacode,
|
areacode=areacode,
|
||||||
)
|
)
|
||||||
|
@ -1195,7 +1195,7 @@ class LoadingSurvex:
|
|||||||
area = path_match.group(1)
|
area = path_match.group(1)
|
||||||
caveid = path_match.group(2)
|
caveid = path_match.group(2)
|
||||||
sluggy = f"{area}-{caveid}"
|
sluggy = f"{area}-{caveid}"
|
||||||
seek = [sluggy, sluggy.replace("1623-","")] # to catch '2023-kt-02' etc
|
seek = [sluggy, sluggy.replace("1623-","")] # to catch '2023-kt-02' etc . 3-digit searches only work for 1623 area
|
||||||
for s in seek:
|
for s in seek:
|
||||||
if s in self.caveslist:
|
if s in self.caveslist:
|
||||||
self.caveslist[cavepath] = self.caveslist[s] # set "caves-1626/107/107" as index to cave 1626-107
|
self.caveslist[cavepath] = self.caveslist[s] # set "caves-1626/107/107" as index to cave 1626-107
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
<h3>Notable caves</h3>
|
<h3>Notable caves</h3>
|
||||||
<ul>
|
<ul>
|
||||||
{% for cave in notablecaves %}
|
{% for cave in notablecaves %}
|
||||||
<li> {{ cave.url|slice:":4" }} <a href="{{ cave.url }}">
|
<li> {{ cave.areacode }} <a href="{{ cave.url }}">
|
||||||
{% if cave.kataster_number %}
|
{% if cave.kataster_number %}
|
||||||
{{ cave.kataster_number }} {{cave.official_name|safe}}</a>
|
{{ cave.kataster_number }} {{cave.official_name|safe}}</a>
|
||||||
{% if cave.unofficial_number %}
|
{% if cave.unofficial_number %}
|
||||||
@ -19,7 +19,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{cave.unofficial_number }} {{cave.official_name|safe}}</a>
|
{{cave.unofficial_number }} {{cave.official_name|safe}}</a>
|
||||||
{% endif %}</td></tr>
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
@ -29,7 +29,6 @@
|
|||||||
<div style="column-count: 3;">
|
<div style="column-count: 3;">
|
||||||
<table class="searchable">
|
<table class="searchable">
|
||||||
{% for cave in caves1623 %}
|
{% for cave in caves1623 %}
|
||||||
|
|
||||||
<tr><td> <a href="{{ cave.url }}">
|
<tr><td> <a href="{{ cave.url }}">
|
||||||
{% if cave.kataster_number %}
|
{% if cave.kataster_number %}
|
||||||
{{ cave.kataster_number }} {{cave.official_name|safe}}</a>
|
{{ cave.kataster_number }} {{cave.official_name|safe}}</a>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user