diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-14 14:24:46 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-14 14:24:46 +0100 |
| commit | 118d132797a89bb3bebbf96daceb5cbd912c735c (patch) | |
| tree | 0514cfb3deae6561fd11d55687ea9aa25738197b /templates | |
| parent | 06487e5534a5334a11f3a7fba62fc714b434f701 (diff) | |
| download | troggle-118d132797a89bb3bebbf96daceb5cbd912c735c.tar.gz troggle-118d132797a89bb3bebbf96daceb5cbd912c735c.tar.bz2 troggle-118d132797a89bb3bebbf96daceb5cbd912c735c.zip | |
[svn] Forgot to upload with earlier commit
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/controlPanel.html | 32 |
2 files changed, 31 insertions, 7 deletions
diff --git a/templates/base.html b/templates/base.html index 2a8e758..09e3017 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,11 +7,13 @@ <script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
+<script>
+ contentHeight();
</script>
{% block head %}{% endblock %}
</head>
-<body onLoad="contentHeight();">
+<body>
<div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
@@ -19,7 +21,7 @@ {% if user.username %}
You are logged in as {{ user.username }}
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
- {% else %} <a href={% url profiles_select_profile %}>sort your profile</a>
+ {% else %}<a href={% url profiles_select_profile %}>sort your profile</a>
{% endif %}.
| <a href="{% url auth_logout %}">Log out</a> {% else %} <a href="{% url registration_register %}">Sign up</a> | <a href="{% url auth_login %}">Log in</a> {% endif %}
{% endblock%}
diff --git a/templates/controlPanel.html b/templates/controlPanel.html index d60a327..028b7f2 100644 --- a/templates/controlPanel.html +++ b/templates/controlPanel.html @@ -1,6 +1,6 @@ {% extends "base.html" %}
{% block content %}
-<form name="form1" method="post" action="">
+<form name="import" method="post" action="">
<h3>Dump:</h3>
@@ -14,9 +14,9 @@ <tr><td>caves from cavetab2.csv using parsers\cavetab.py</td><td> <input type="checkbox" class="parser" name="import_cavetab"/></td></tr>
<tr><td>logbook entries using parsers\logbooks.py</td><td><input type="checkbox" name="import_logbooks"/></td></tr>
<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_people"/></td></tr>
-<tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="QMs" value="import_QMs" /></td></tr>
+<tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="import_QMs" /></td></tr>
<tr><td>survey scans using parsers\surveys.py</td><td><input type="checkbox" name="import_surveys" /></td></tr>
-<tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="survex" value="import_survex" /></td></tr>
+<tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="import_survex" /></td></tr>
</table>
@@ -28,10 +28,32 @@ </p>
</form>
+
<h3>Export to csv:</h3>
<table>
<tr>
- <td>caves to cavetab2.csv</td><td> <input name="export_cavetab" type="submit" id="export_cavetab" value="Export" disabled /></td></tr>
-</label>
+ <td>
+ caves to cavetab2.csv
+ </td>
+ <td>
+ <form name="export" method="post" action="">
+ <p>Overwrite the existing CAVETAB2.CSV file with one generated by Troggle.</p>
+ <input name="export_cavetab" type="submit" value="Update {{settings.EXPOWEB}}noinfo/CAVETAB2.CSV" />
+ </form>
+ </td>
+ <td>
+ <form name="export" method="get" action={% url downloadcavetab %}>
+ <p>Download a CAVETAB2.CSV file which is dynamically generated by Troggle.</p>
+ <input name="download_cavetab" type="submit" value="Download CAVETAB2.CSV" />
+ </form>
+ </td>
+</tr>
+
+ <td>qms to qms.csv</td><td>
+ <input name="export_cavetab" type="submit" value="Update qms file for" disabled />
+ <input name="export_cavetab_view" type="submit" value="Download file" disabled />
+ </td></tr>
</table>
+</form>
+
{% endblock %}
\ No newline at end of file |