[svn] Forgot to upload with earlier commit

This commit is contained in:
substantialnoninfringinguser 2009-05-14 14:24:46 +01:00
parent 06487e5534
commit 118d132797
2 changed files with 31 additions and 7 deletions

View File

@ -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%}

View File

@ -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 %}