diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/cave.html | 9 | ||||
-rw-r--r-- | templates/editentrance.html | 2 | ||||
-rw-r--r-- | templates/logbook2005style.html | 11 |
3 files changed, 20 insertions, 2 deletions
diff --git a/templates/cave.html b/templates/cave.html index dd1155a..c7aa579 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -188,6 +188,15 @@ Nope, it is not useful, removing it... Philip S. {% if ent.entrance.lat_wgs84 %} <dt>Location</dt><dd><a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.lat_wgs84|floatformat:7}}&mlon={{ent.entrance.long_wgs84|floatformat:7}}">WGS84 Lat.: {{ ent.entrance.lat_wgs84|floatformat:7 }} N, Long.:{{ ent.entrance.long_wgs84|floatformat:7 }} E</a></dd> +<p>This would be eventually replaced with something like this in the appropriate gps file in the <var>fixedpts/gps/</var> folder +for the kataster area <var>{{cave.areacode}}</var> : +<pre><code>*begin +*cs out UTM33 +*cs LONG-LAT +*fix p{{ ent.entrance.name|lower|safe }} {{ent.entrance.long_wgs84|floatformat:7}} {{ ent.entrance.lat_wgs84|floatformat:7 }} {% if ent.entrance.alt %}{{ ent.entrance.alt|safe }}{% else%}0.0{% endif %} +*end</code></pre> +and the appropriate <var>*equate</var> and <var>*entrance</var> fields in the survex file <var>{{cave.survex_file|safe}}</var> +to equate <var>p{{ ent.entrance.name|lower|safe }}</var> to the actual survey station. The WGS84 fields on the entrance edit form would be deleted, and a Tag/Other survex station id to <var>{{cave.areacode}}.p{{ ent.entrance.name|lower|safe }} </var>used instead. {% endif %} {% if ent.entrance.tag_station %} <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.tag.latlong.0}}&mlon={{ent.entrance.tag.latlong.1}}">{{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E</a> (UTM33 {{ ent.entrance.tag.x|floatformat:0 }}, {{ ent.entrance.tag.y|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m (SRTM is {{ ent.entrance.tag.srtm_diff.0|safe }} m, distance from reference: {{ent.entrance.tag.srtm_alt.1|floatformat:0}}m) diff --git a/templates/editentrance.html b/templates/editentrance.html index d9957a0..f43bb23 100644 --- a/templates/editentrance.html +++ b/templates/editentrance.html @@ -9,7 +9,7 @@ {% include 'html_editor_pop_ups.html' %} <!-- If you are looking for the furniture that creates the fields on this form, you need to look -at troggle/core/forms.py ass this uses a Django magic form creation thinggy. --> +at troggle/core/forms.py as this uses a Django magic form creation thinggy. --> <h2>{{message}}</h2> <form action="" method="post">{% csrf_token %} diff --git a/templates/logbook2005style.html b/templates/logbook2005style.html index 668ea9d..0956d81 100644 --- a/templates/logbook2005style.html +++ b/templates/logbook2005style.html @@ -20,8 +20,12 @@ Exported on {% now 'Y-m-d H:m' %} using either the control panel webpage or when See troggle/code/views/other.py and core.models/logbooks.py writelogbook(year, filename) --> <body> -{%for logbook_entry in logbook_entries%}<hr /> +<button type="button" onclick="window.scrollTo(0, document.body.scrollHeight)" autofocus>Scroll To Bottom</button> +<br/> +<a href="/logbookedit/">Add Log book entry</a> + +{%for logbook_entry in logbook_entries%} <hr /> <div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div> <div class="trippeople">{{logbook_entry.get_participants|safe}}</div> <div class="triptitle">{{logbook_entry.title|safe}}</div> @@ -29,5 +33,10 @@ See troggle/code/views/other.py and core.models/logbooks.py writelogbook(year, f <div class="timeug">T/U: {{logbook_entry.time_underground|safe}} hours</div> <div class="editentry"><br /><a href="/logbookedit/{{logbook_entry.slug}}">Edit this entry</a><br /></div> {% endfor %}<hr /> + +<button type="button" onclick="window.scrollTo(0, 0)" autofocus>Scroll To Top</button> +<br/> +<a href="/logbookedit/">Add Log book entry</a> + </body> </html> |