diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 27 | ||||
| -rw-r--r-- | templates/controlPanel.html | 27 | ||||
| -rw-r--r-- | templates/survey.html | 37 |
3 files changed, 61 insertions, 30 deletions
diff --git a/templates/base.html b/templates/base.html index bb6d9b3..37cddf0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -65,15 +65,25 @@ window.onload = contentHeight; <li><a href="#">External links</a>
<ul class="sub_menu">
- <li><a id="cuccLink" href="http://cucc.survex.com">CUCC website</a></li>
+ <li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
<li><a id="expoWebsiteLink" href="http://cucc.survex.com/expo">Expedition website</a></li>
</ul>
</li>
<li><a href="{% url frontpage %}">Troggle front page</a></li>
<li><a id="cavesLink" href="{% url caveindex %}">caves</a></li>
<li><a id="caversLink" href="{% url personindex %}">cavers</a></li>
+ <li><a href="#">expeditions</a>
+ <ul class="sub_menu">
+ <li><a id="expeditionsLink" href="{{ Expedition.objects.latest.get_absolute_url }}">newest</a></li>
+ <li><a id="expeditionsLink" href="{% url expeditions %}">list all</a></li>
+ </ul>
+ </li>
<li><a id="surveyBinderLink" href="{% url survey %}">survey binder</a></li>
- <li><a href="{% url stats %}">statistics</a></li>
+ <li><a href="#">diversions</a>
+ <ul class="sub_menu">
+ <li><a href="{% url stats %}">statistics</a></li>
+ </ul>
+ </li>
<li><a href="{% url calendar 2008 %}">expedition calendar</a></li>
<li><a href="#">admin</a>
<ul class="sub_menu">
@@ -84,18 +94,5 @@ window.onload = contentHeight; </ul>
<div class="toggleMenu" style="display:none; position:fixed; bottom:0; right:130px"><a href="#">Show menu</a></li>
-
-<!--
- <a id="cuccLink" href="http://cucc.survex.com">CUCC website</a> |
- <a id="expoWebsiteLink" href="http://cucc.survex.com/expo">Expedition website</a> |
- External links |
- <a href="{% url frontpage %}">Troggle front page</a> |
- <a href="{% url caveindex %}">Caves</a> |
- <a id="caversLink" href="{% url personindex %}">Cavers</a> |
- <a id="surveyBinderLink" href="{% url survey %}"> Survey binder</a> |
- <a href="{% url stats %}"> Statistics</a> |
- <a href="{% url calendar 2008 %}">Expedition calendar</a>
-</div>
--->
</body>
</html>
diff --git a/templates/controlPanel.html b/templates/controlPanel.html index bce56f8..487b7d1 100644 --- a/templates/controlPanel.html +++ b/templates/controlPanel.html @@ -1,15 +1,30 @@ {% extends "base.html" %}
{% block content %}
-<form name="import" method="post" action="">
-<h3>Dump:</h3>
+
+{% if jobs_completed %}
+ <div style="border:thin black solid; width: 40%; color:#F00; margin-left:auto; margin-right:auto">
+ Just finished running:
+ <ul>
+ {% for job in jobs_completed %}
+ <li>{{ job }}</li>
+ {% endfor %}
+ </ul>
+ {% if settings.LOGFILE %}See the logfile at {{settings.LOGFILE.path}} for more information.{% endif %}
+ <a href="#" class="closeDiv">dismiss this message</a>
+ </div>
+{% endif %}
+
+
+<form name="reset" method="post" action="">
+<h3>Wipe:</h3>
<table>
-<tr><td>Dump entire database and recreate tables: </td><td><input type="checkbox" name="dump_db" /></td></tr>
+<tr><td>Wipe entire database and recreate tables: </td><td><input type="checkbox" name="reset" /></td><td> <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility."></td></tr>
</table>
-
+</form>
<h3>Import (non-destructive):</h3>
-
+<form name="import" method="post" action="">
<table>
<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>
@@ -24,7 +39,7 @@ <p>
<input type="submit" id="Import" value="Import">
- <input type="submit" name="check_all_import" id="check_all_import" value="Check all">
+ <input type="submit" name="check_all_import" id="check_all_import" value="Check all" disabled >
</p>
</form>
diff --git a/templates/survey.html b/templates/survey.html index 9d677e5..290cd97 100644 --- a/templates/survey.html +++ b/templates/survey.html @@ -11,8 +11,27 @@ blankColor = "rgb(153, 153, 153)"
highlightedColor = "rgb(125, 125, 125)"
chosenColor = "rgb(255, 255, 255)"
-
+
+ $(document).ready(function() {
+ $(".menuBarItem").click(function() {
+ $("#"+this.id+"Content").toggle();
+ if ($(this).hasClass('on')){
+ $(this).removeClass('on');}
+ else {
+ $(this).addClass('on');
+ }
+ });
+ });
+
+ function redirectSurvey(){
+ window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23" + document.getElementById("surveyChooser").value;
+ }
+
+ function redirectYear(){
+ window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23";
+ }
</script>
+
{% endblock %}
<div id="currentLocation">
@@ -45,7 +64,7 @@ <div>
<!-- <h4>Click to toggle:</h4>-->
- <div id="progressTable" class="menuBarItem" > {% if current_expedition.survey_set.all %}✓{% endif %}
+ <div id="progressTable" class="menuBarItem"> {% if current_expedition.survey_set.all %}✓{% endif %}
survey progress table </div>
</div>
@@ -70,16 +89,16 @@ </center>
<!-- <h4>Click to toggle:</h4>-->
<div id="surveyWalletNav">
- <div id="notes" class="menuBarItem" > {% if notes %}✓{% endif %}
+ <div id="notes" class="menuBarItem" "> {% if notes %}✓{% endif %}
scanned notes </div>
- <div id="survexFile" class="menuBarItem" > {% if current_survey.survex_file %}✓{% endif %}
+ <div id="survexFile" class="menuBarItem" "> {% if current_survey.survex_file %}✓{% endif %}
survex file </div>
- <div id="printedCentreline" class="menuBarItem" > {% if current_survey.centreline_printed_on %}✓{% endif %}
+ <div id="printedCentreline" class="menuBarItem" "> {% if current_survey.centreline_printed_on %}✓{% endif %}
printed centreline </div>
- <div id="scannedPassageSketch" class="menuBarItem" > {% if planSketches %}✓{% endif %}
+ <div id="scannedPassageSketch" class="menuBarItem" "> {% if planSketches %}✓{% endif %}
scanned passage sketch </div>
- <div id="tunnelXMLfile" class="menuBarItem" >tunnel xml file</div>
- <div id="mainSketchIntegration" class="menuBarItem" >add to main sketch</div>
+ <div id="tunnelXMLfile" class="menuBarItem" ">tunnel xml file</div>
+ <div id="mainSketchIntegration" class="menuBarItem" ">add to main sketch</div>
</div>
</div>
{% endblock %}
@@ -141,7 +160,7 @@ </p>
</div>
{% endfor %}
- <div class="figure"> <a href="{{ settings.URL_ROOT }}admin/expo/scannedimage/add/" target="_blank"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned notes page. </a> </div>
+ <div class="figure"> <a href="{{ settings.URL_ROOT }}admin/expo/scannedimage/add/"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned notes page. </a> </div>
</div>
<br class="clearfloat" />
<div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />
|