diff options
author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-17 04:31:23 +0100 |
---|---|---|
committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-17 04:31:23 +0100 |
commit | 21c39f70de1fa20ae20933a761773e9b15ea1a11 (patch) | |
tree | 443504a7967e9d302fc4365193097c1a6cbf10eb /templates | |
parent | 7566faf77b488ce391917f5ae6aabb09842ed620 (diff) | |
download | troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.tar.gz troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.tar.bz2 troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.zip |
[svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.
- Fix problems in QM parsing script
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base.html | 6 | ||||
-rw-r--r-- | templates/controlPanel.html | 46 | ||||
-rw-r--r-- | templates/survey.html | 68 |
3 files changed, 54 insertions, 66 deletions
diff --git a/templates/base.html b/templates/base.html index 5615a8e..de1f73c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,13 +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 language="javascript">
+window.onload = contentHeight;
</script>
{% block head %}{% endblock %}
</head>
-<body onLoad="contentHeight()">
+<body>
<div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
diff --git a/templates/controlPanel.html b/templates/controlPanel.html index 028b7f2..bce56f8 100644 --- a/templates/controlPanel.html +++ b/templates/controlPanel.html @@ -42,18 +42,56 @@ </form>
</td>
<td>
- <form name="export" method="get" action={% url downloadcavetab %}>
+ <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>
+
+<tr>
+ <td>
+ surveys to Surveys.csv
+ </td>
+ <td>
+ <form name="export" method="post" action="">
+ <p>Overwrite the existing Surveys.csv file with one generated by Troggle.</p>
+ <input disabled name="export_surveys" type="submit" value="Update {{settings.SURVEYS}}noinfo/Surveys.csv" />
+ </form>
+ </td>
+ <td>
+ <form name="export" method="get" action={% url downloadsurveys %}>
+ <p>Download a Surveys.csv file which is dynamically generated by Troggle.</p>
+ <input disabled name="download_surveys" type="submit" value="Download Surveys.csv" />
+ </form>
+ </td>
+</tr>
+<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 />
+ <form name="export_qms" method="get" action="downloadqms">
+
+<!--This is for choosing caves by area (drilldown).
+
+ <select id="qmcaveareachooser" class="searchable" >
+ </select>
+
+ -->
+
+ Choose a cave.
+ <select name="cave_id" id="qmcavechooser">
+
+ {% for cave in caves %}
+ <option value="{{cave.kataster_number}}">{{cave}}
+ </option>
+ {% endfor %}
+
+ </select>
+
+ <input type="submit" value="Download"/>
+ </form>
</td></tr>
</table>
</form>
-{% endblock %}
\ No newline at end of file +{% endblock %}
\ No newline at end of file diff --git a/templates/survey.html b/templates/survey.html index a0395b6..9d677e5 100644 --- a/templates/survey.html +++ b/templates/survey.html @@ -11,57 +11,7 @@ blankColor = "rgb(153, 153, 153)"
highlightedColor = "rgb(125, 125, 125)"
chosenColor = "rgb(255, 255, 255)"
- mnuItmLst=document.getElementsByClassName("menuBarItem")
- function highlight(div){
- for (var i = 0, divIter; divIter = mnuItmLst[i]; i++) {
- /*loop though all menuitems. blank them except ones that are toggled on*/
- if (divIter.style.backgroundColor!=chosenColor){
- divIter.style.backgroundColor=blankColor;
- }
- }
- /*highlight the mouseovered div unless it is toggled on*/
- if (div.style.backgroundColor!=chosenColor){
- div.style.backgroundColor=highlightedColor;
- }
- }
-
- function unhighlight(div){
- /*highlight the mouseovered div unless it is the chosen one*/
- if (div.style.backgroundColor!=chosenColor){
- div.style.backgroundColor=blankColor;
- }
- }
-
- function toggle(div){
- if (document.getElementById(div.id+"Content").style.display="none"){
- document.getElementById(div.id+"Content").style.display="block";
- div.style.backgroundColor=chosenColor;
- }
- else {
- document.getElementById(div.id+"Content").style.display="none";
- div.style.backgroundColor=blankColor;
- }
- }
-
-/* function choose(div){
- for (var i = 0, divIter; divIter = mnuItmLst[i]; i++) {
- document.getElementById(divIter.id+"Content").style.display="none";
- }
- document.getElementById(div.id+"Content").style.display="block";
- for (var i = 0, divIter; divIter = mnuItmLst[i]; i++) {
- document.getElementById(divIter.id).style.backgroundColor=blankColor;
- }
- div.style.backgroundColor=chosenColor;
- document.getElementById(progressTableContent).style.display="none";
- }*/
-
- 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 %}
@@ -95,7 +45,7 @@ <div>
<!-- <h4>Click to toggle:</h4>-->
- <div id="progressTable" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)"> {% if current_expedition.survey_set.all %}✓{% endif %}
+ <div id="progressTable" class="menuBarItem" > {% if current_expedition.survey_set.all %}✓{% endif %}
survey progress table </div>
</div>
@@ -120,16 +70,16 @@ </center>
<!-- <h4>Click to toggle:</h4>-->
<div id="surveyWalletNav">
- <div id="notes" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)"> {% if notes %}✓{% endif %}
+ <div id="notes" class="menuBarItem" > {% if notes %}✓{% endif %}
scanned notes </div>
- <div id="survexFile" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)"> {% 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" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)"> {% 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" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)"> {% if planSketches %}✓{% endif %}
+ <div id="scannedPassageSketch" class="menuBarItem" > {% if planSketches %}✓{% endif %}
scanned passage sketch </div>
- <div id="tunnelXMLfile" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)">tunnel xml file</div>
- <div id="mainSketchIntegration" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)">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 %}
@@ -191,7 +141,7 @@ </p>
</div>
{% endfor %}
- <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 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>
<br class="clearfloat" />
<div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />
|