diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/core/todos.html | 2 | ||||
| -rw-r--r-- | templates/expedition.html | 6 | ||||
| -rw-r--r-- | templates/logbookentrynew-pending-deletion.html (renamed from templates/newlogbookentry.html) | 0 | ||||
| -rw-r--r-- | templates/scanuploadform.html | 42 | ||||
| -rw-r--r-- | templates/simpleupload.html | 50 |
5 files changed, 48 insertions, 52 deletions
diff --git a/templates/core/todos.html b/templates/core/todos.html index de1fd1d..3122ddc 100644 --- a/templates/core/todos.html +++ b/templates/core/todos.html @@ -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 %}
\ No newline at end of file diff --git a/templates/expedition.html b/templates/expedition.html index 3533e28..ac86efe 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -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> diff --git a/templates/newlogbookentry.html b/templates/logbookentrynew-pending-deletion.html index bdb0919..bdb0919 100644 --- a/templates/newlogbookentry.html +++ b/templates/logbookentrynew-pending-deletion.html diff --git a/templates/scanuploadform.html b/templates/scanuploadform.html new file mode 100644 index 0000000..c08a165 --- /dev/null +++ b/templates/scanuploadform.html @@ -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 %} diff --git a/templates/simpleupload.html b/templates/simpleupload.html deleted file mode 100644 index d97234c..0000000 --- a/templates/simpleupload.html +++ /dev/null @@ -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 %} |