diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave.html | 9 | ||||
| -rw-r--r-- | templates/logbookform.html | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/templates/cave.html b/templates/cave.html index c7aa579..6a7cb10 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -187,7 +187,9 @@ Nope, it is not useful, removing it... Philip S. {% endif %} {% 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> + <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 @@ -200,6 +202,9 @@ to equate <var>p{{ ent.entrance.name|lower|safe }}</var> to the actual survey st {% 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) + + +<a href="https://osmand.net/map/?pin={{ ent.entrance.tag.latlong.0}},{{ ent.entrance.tag.latlong.1}}#20/{{ ent.entrance.tag.latlong.0|floatformat:7}}/{{ent.entrance.tag.latlong.1|floatformat:7}}">OSMand</a> </dd> {% endif %} {% if ent.entrance.bearings %} @@ -210,6 +215,8 @@ to equate <var>p{{ ent.entrance.name|lower|safe }}</var> to the actual survey st {% if ent.entrance.other_description %} - {{ ent.entrance.other_description|safe }} {% endif %} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.other_location.latlong.0}}&mlon={{ent.entrance.other_location.latlong.1}}"> {{ ent.entrance.other_location.latlong.0|floatformat:7 }}N {{ ent.entrance.other_location.latlong.1|floatformat:7 }}E</a> (UTM33 {{ ent.entrance.other_location.x|floatformat:0 }}, {{ ent.entrance.other_location.y|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m (SRTM is {{ ent.entrance.other_location.srtm_diff.0|safe }}m, distance from reference: {{ent.entrance.other_location.srtm_alt.1|floatformat:0}}m) + +<a href="https://osmand.net/map/?pin={{ ent.entrance.other_location.latlong.0}},{{ ent.entrance.other_location.latlong.1}}#20/{{ ent.entrance.other_location.latlong.0|floatformat:7}}/{{ent.entrance.other_location.latlong.1|floatformat:7}}">OSMand</a> </dd> {% endif %} </dl> diff --git a/templates/logbookform.html b/templates/logbookform.html index b5a18a5..28a28c8 100644 --- a/templates/logbookform.html +++ b/templates/logbookform.html @@ -11,7 +11,7 @@ {% endif %} <div align=center> {% if date %}<p>Link to <em><a href="/logbookentry/{{date}}/{{slug}}#">this entry</a></em> {% endif %} - <a href="/logreport/{{logbookentry.expedition.year}}">logbook report</a> + <a href="/logreport/{{year}}">logbook report {{year}}</a> <a href="/handbook/logbooks.html#form">How to use this form</a> </div> {% if save_bad %} @@ -71,6 +71,7 @@ title="Place: cave name, or 'plateau', 'topcamp' " {% if place %}value="{{place}}"{% else %}placeholder="basecamp" {% endif %} required /> +<br>(If any cave is visited at all, put in the cave id and not 'plateau') <br /><br /> <label for="title">Title</label> <input {% if not user.username %} disabled{% endif %} @@ -82,7 +83,7 @@ <textarea {% if not user.username %} disabled{% endif %} rows="{% if textrows%}{{textrows}}{% else %}5{% endif %}" cols="70" label = "" name = "text" - required />{% if entry %}{{entry}}{% else %}We had a lot of fun...{% endif %} + required />{% if entry %}{{entry}}{% else %}We had a lot of fun in the rain...{% endif %} </textarea> <br> [Type in text in <a href="/handbook/logbooks.html#form">Logbook HTML format</a>.] |