expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 16:28:06 +00:00
Code Issues 18 Projects 3 Activity

make ?reload private and clean old error msgs

Browse Source
This commit is contained in:
Philip Sargent
2021-04-23 03:07:21 +01:00
parent 1a4be0f02e
commit dbd186e299
10 changed files with 172 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/core/todos.html
View File

@@ -1,3 +1,3 @@
{% extends "baseapi.html" %}
{% block content %}<pre>{% for k, v in tododict.items %}<b><big>{{k}}</big></b>: {{v}}<br />
{% block content %}<pre>{% for k, v in tododict.items %}<b><big>{{k}}</big></b>:<br> {{v}}<br />
{% endfor %}</pre>{% endblock %}

6
templates/expedition.html
View File

@@ -20,7 +20,9 @@
{% endfor %}
</p>
<p>See also the <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo
{% if logged_in %}
<p>Reparse and reload this year's logbook by clicking here: <a href="/expedition/{{expedition.year}}?reload">RELOAD</a>
{% endif %}
<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.
The columns are the date in the month (July or August), with a "T" for a logbook entry, and
@@ -60,7 +62,9 @@ an "S" for a survey trip. The colours are the same for people on the same trip.
{% endfor %}
</table>
<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
{% if logged_in %}
<form action="" method="GET"><input type="submit" name="reload" value="Reload from logbook"></form>
{% endif %}
<h3>Logbooks and survey trips per day</h3>

0
templates/newlogbookentry.html → templates/logbookentrynew-pending-deletion.html
View File

42
templates/scanuploadform.html Normal file
View File

@@ -0,0 +1,42 @@
{% extends "base.html" %}
{% block title %}Simple Fileupload{% endblock %}
{% block content %}
<h2>Survey Scan upload into Wallet</h2>
<div style="column-count: 2;">
<div style = "max-width:40%px; " >
{% if filesaved %}
<p style="margin-left:20%;">
<b>The file was saved as <em>'{{actual_saved}}'</em> <br><br>Upload another?</b>
</p>
<br>
{% endif %}
<form method ='post' enctype ="multipart/form-data">
{% csrf_token %}
<br>
<input type = "file" style = "margin-left:20%;"
placeholder = "Simplefile" name = "simplefile" id="files"><label for="files">Scan file(s)</label>
<br> <br>
<input type = "text" style = "margin-left:20%;"
placeholder = "Wallet id e.g. 2021#23" name = "title" value='2050#99'id="wallet"><label for="wallet"> Wallet id</label>
</div>
<div style = "max-width:30%;">
<center>
<button style = "color: #fff; border:1px; background-color:#999; margin-top:8%;
height:35px; width:80%; margin-left:19%;" type = "submit" value = "Upload" >
<strong>Upload</strong>
</button>
</center>
</div>
</form>
</div>
</div>
{% endblock %}

50
templates/simpleupload.html
View File

@@ -1,50 +0,0 @@
{% extends "base.html" %}
{% block title %}Simple Fileupload{% endblock %}
{% block content %}
<h2>Survey Scan upload into Wallet</h2>
<div style = "max-width:470px; " >
{% if filesaved %}
<p style="margin-left:20%;">
<b>The file was saved as <em>'{{actual_saved}}'</em> <br><br>Upload another?</b>
</p>
<br>
{% endif %}
<form method ='post' enctype ="multipart/form-data">
{% csrf_token %}
<br>
<input type = "file" style = "margin-left:20%;"
placeholder = "Simplefile" name = "simplefile" />
<br> <br>
<input type = "text" style = "margin-left:20%;"
placeholder = "Wallet id e.g. 2021#23" name = "title" value='2021#99' label="Wallet id"/>
</div>
<div style = "max-width:470px;">
<center>
<button style = "color: #fff; border:1px; background-color:#999; margin-top:8%;
height:35px; width:80%; margin-left:19%;" type = "submit" value = "Upload" >
<strong>Upload</strong>
</button>
</center>
</div>
</form>
</div>
{% endblock %}