diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave.html | 9 | ||||
| -rw-r--r-- | templates/cavewallets.html | 2 | ||||
| -rw-r--r-- | templates/editentrance.html | 2 | ||||
| -rw-r--r-- | templates/logbookform.html | 1 | ||||
| -rw-r--r-- | templates/personwallets.html | 1 | ||||
| -rw-r--r-- | templates/photouploadform.html | 2 | ||||
| -rw-r--r-- | templates/wallet_table.html | 3 | ||||
| -rw-r--r-- | templates/walletform.html | 8 | ||||
| -rw-r--r-- | templates/yearwallets.html | 2 |
9 files changed, 22 insertions, 8 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/cavewallets.html b/templates/cavewallets.html index 7635f6a..ace826d 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -23,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% include 'wallet_table.html' %} -<p>Note that names in italics are copied from the related survex file block name. + <br /> <p>Total underground survey length: {{length_ug|floatformat:"1g"}} m<br /> Note that this is for <em>all the wallets</em> listed above, which includes those which are surveys of different caves not just {{cave}}. 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/logbookform.html b/templates/logbookform.html index 8d9e86e..a6c65eb 100644 --- a/templates/logbookform.html +++ b/templates/logbookform.html @@ -11,6 +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/{{year}}">logbook report {{year}}</a> <a href="/handbook/logbooks.html#form">How to use this form</a> </div> {% if save_bad %} diff --git a/templates/personwallets.html b/templates/personwallets.html index a7aa732..0c54e46 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -21,7 +21,6 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% endfor %}</ul> {% include 'wallet_table.html' %} -<p>Note that names in italics are copied from the related survex file block name. <br /> <p>Total underground survey length: {{length_ug|floatformat:"1g"}} m - but this includes all the surveys associated with the wallet, including those where <em>{{person.fullname|safe}}</em> did not participate. <br /> diff --git a/templates/photouploadform.html b/templates/photouploadform.html index a2167fb..e113bef 100644 --- a/templates/photouploadform.html +++ b/templates/photouploadform.html @@ -25,10 +25,12 @@ <label style="padding: 0.5em 25px; margin-left: 110px" for="renameto"><br />If uploading a single file, you can rename it<br></label> + <br><br><br> <button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 155px" type = "submit" value = "Upload" > Upload </button> + <br /> <em>Be Patient!</em> This takes a while. </form> </div> <div style = "max-width:29%; margin-left:20%; text-align: left" > diff --git a/templates/wallet_table.html b/templates/wallet_table.html index ba02e14..7989f8e 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -60,3 +60,6 @@ which is probably more useful. {% endfor %} </table> +<p>Note that names in italics are copied from the related survex file block name.<br /> +Note also that survex data recently uploaded will not appear in this table until a database reset is done on the server. + diff --git a/templates/walletform.html b/templates/walletform.html index e663515..4f05c6f 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -156,7 +156,7 @@ and <em>also</em> the exported files in standard formats: svx, svg etc. See why <a href="/cave/scans/{{c.slug}}">{{c}}</a> {% endfor %}<br /> - {% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %} + {% if psg %}<u>Place being surveyed</u>: <b>{{psg}}</b><br>{% endif %} {% if svxfiles %}<u>Survex files</u>: {% for svx in svxfiles %} <a href="/survexfile/{{svx|urlencode}}">{{svx}}</a> @@ -187,10 +187,10 @@ and <em>also</em> the exported files in standard formats: svx, svg etc. See why title="Single cave id or comma-separated list e.g. 2017-DM-01, 1623-256. " placeholder="{{cave}}" value="{{cave}}" /> <br> - <label for="psg">Survey area (wallet name)</label> + <label for="psg">Place being surveyed (name for the wallet)</label> <input {% if not user.username %} disabled{% endif %} - label = "Survey area" name = "psg" size ="{{psgsize}}" - title="Survey area, e.g. White Elephant or Nieder Augst Eck" + label = "Place being surveyed" name = "psg" size ="{{psgsize}}" + title="Place being surveyed, e.g. White Elephant or Nieder Augst Eck" placeholder="{{psg}}" value="{{psg}}" /> <br> <label for="freetext">Free text for comments</label> diff --git a/templates/yearwallets.html b/templates/yearwallets.html index 69b73e3..efa4416 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -29,7 +29,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c </ul> {% include 'wallet_table.html' %} -<p>Note that names in italics are copied from the related survex file block name. +<br /> <p>Total underground survey length: {{length_ug|floatformat:"1g"}} m <br /> <table width=95%> |