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

new complaints messages for wallet

Browse Source
This commit is contained in:
Philip Sargent 2022-07-17 15:00:37 +03:00
parent 8aab01c126
commit 810e058c07
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
templates/scanuploadform.html
View File

@ -4,7 +4,12 @@
{% block content %} {% block content %}
<h2>Upload scan into wallet {{wallet}}</h2> {% if user.username %}
<h2>Wallet {{wallet}} - edit settings or upload a file</h2>
{% else %}
<h2>Wallet {{wallet}}</h2>
{% endif %}
<p style="font-family: monospace; font-weight: bold; font-size: 130%; text-align: center"> <p style="font-family: monospace; font-weight: bold; font-size: 130%; text-align: center">
<a style="font-weight: normal;" href="/scanupload/{{prevy}}:01">{{prevy}}</a> <a style="font-weight: normal;" href="/scanupload/{{prevy}}:01">{{prevy}}</a>
&nbsp;...&nbsp; &nbsp;...&nbsp;
@ -42,7 +47,7 @@
{% for f in files %} {% for f in files %}
<a href="/expofiles/surveyscans/{{year}}/{{wallet|urlencode}}/{{f}}">{{ f}}</a><br /> <a href="/expofiles/surveyscans/{{year}}/{{wallet|urlencode}}/{{f}}">{{ f}}</a><br />
{% empty %} {% empty %}
<p>&lt;No files here&gt; <p>&lt;No files in this wallet.&gt;
{% endfor %} {% endfor %}
</p> </p>
{% if create %} {% if create %}
@ -51,19 +56,38 @@
{% endif %} {% endif %}
<p><em> <p><em>
<a href="/expofiles/surveyscans/{{year}}/{{wallet|urlencode}}/walletindex.html">Wallet status page</a> <a href="/expofiles/surveyscans/{{year}}/walletindex.html">Wallet index for this year</a> (old script, being replaced...)
<br /> <br />
<a href="/expofiles/surveyscans/{{year}}/walletindex.html">Wallet index for this year</a> <a href="/expedition/{{year}}">Logbook entries, people, Survex files for {{year}}</a>
<br />
<a href="/expedition/{{year}}">Logbook entries, Survex files for this year</a>
</em> </em>
</div> </div>
{% if complaints %}
<h3 style="text-align: left; color: red">Complaints</h3>
<ul style="list-style-type: disc; color: red">
{% for cmp in complaints%}
<li>{{cmp}}
{% endfor %}
</ul>
{% if user.username %}
{% else %}
<p>You will need to log in to the website (top right menu bar) to be able to edit the settings on this wallet.
{% endif %}
{% endif %}
<hr /> <hr />
{% if not create %} {% if not create %}
<br> <br>
<span style="font-family: monospace; font-size: 150%; "> <span style="font-family: monospace; font-size: 150%; ">
{% if cave %}<u>Cave ID</u>: <b>{{cave}}</b><br> {% endif %} {% if cave %}<u>Cave ID</u>:
{% if caveobject %}<b>{{cave}}</b></a> which implies "<a href="/{{caveobject.url}}">{{caveobject}}</a>"<br>
{% else %}
<b>{{cave}}</b><br>
{% endif %}
{% endif %}
{% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %} {% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %}
{% if svxfiles %}<u>Survey files</u>: {% if svxfiles %}<u>Survey files</u>:
{% for svx in svxfiles%} {% for svx in svxfiles%}
@ -119,8 +143,8 @@
<label for="elevnr">Elevation not required ?</label> <label for="elevnr">Elevation not required ?</label>
<input type="checkbox" name="elevnr" id="elevnr" value="True" {% if "elev not required" in checked %}checked{% endif %}> <input type="checkbox" name="elevnr" id="elevnr" value="True" {% if "elev not required" in checked %}checked{% endif %}>
<br> <br>
<label for="survexvnr">Survex file not required ?</label> <label for="survexnr">Survex file not required ?</label>
<input type="checkbox" name="survexvnr" id="survexvnr" value="True" {% if "survex not required" in checked %}checked{% endif %}> <input type="checkbox" name="survexnr" id="survexnr" value="True" {% if "survex not required" in checked %}checked{% endif %}>
<br> <br>
<label for="pland">Plan drawn ?</label> <label for="pland">Plan drawn ?</label>
<input type="checkbox" name="pland" id="pland" value="True" {{chkpland}} {% if "plan drawn" in checked %}checked{% endif %}> <input type="checkbox" name="pland" id="pland" value="True" {{chkpland}} {% if "plan drawn" in checked %}checked{% endif %}>