remove all the DOS linefeeds

1 files changed, 193 insertions, 193 deletions

diff --git a/templates/survey.html b/templates/survey.html
index 37b2dfe..9dca0df 100644
--- a/templates/survey.html
+++ b/templates/survey.html
@@ -1,193 +1,193 @@
-{% extends "base.html" %}

-{% load wiki_markup %}

-

-

-{% block title %}CUCC Virtual Survey Binder: {{ current_expedition }}{{ current_survey }}{%endblock%}

-{% block head %}

-

-<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/nav.css" />

-

-<script language="javascript">

-	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">

-  CUCC Expo virtual survey binder:

-  {% if current_survey %}

-  {{current_survey}}

-  {% else %}

-  {{current_expedition}}

-  {% endif %}

-</div>

-

-{% block nav %}

-  <br />

-

-  <h3>Choose a year</h3>

-	<center>

-  <select id="expeditionChooser" class="centre" onChange="redirectYear()">

-    

-	<option value=""/>

-	{% for expedition in expeditions %}   	

-    <option label="{{ expedition }}" value="{{ expedition }}" {% ifequal expedition current_expedition %}selected{% endifequal %}>

-    

-	    {{ expedition }}

-    

-    </option>   

-    {% endfor %}

-  

-  </select>

-  	</center>

-

-  <div>

-<!--  	<h4>Click to toggle:</h4>-->

-    <div id="progressTable" class="menuBarItem"> {% if current_expedition.survey_set.all %}&#10003;{% endif %}

-      survey progress table </div>

-  </div>      

-{% if current_expedition %}    

-   <h3>Choose a wallet number   </h3>

-   <center>

-     <select id="surveyChooser" class="centre" onChange="redirectSurvey()">

-    <option label="show all" value="">

-

-    </option>

-         {% for survey in current_expedition.survey_set.all %}

-         

-    <option label="{{ survey }}" value="{{ survey.wallet_number }}" 

-    		{% ifequal survey current_survey %}

-    			selected

-	        {% endifequal %}>

-            {{ survey }}

-	</option>

-    

-    {% endfor %}

-        

-    <option label="add" value="add">

-  </select>

-

-  </center>

-      	<h4>Click to toggle:</h4>

-  <div id="surveyWalletNav">

-    <div id="notes" class="menuBarItem"> {% if notes %}&#10003;{% endif %}

-      scanned notes </div>

-    <div id="survexFile" class="menuBarItem"> {% if current_survey.survex_file %}&#10003;{% endif %}

-      survex file </div>

-    <div id="printedCentreline" class="menuBarItem"> {% if current_survey.centreline_printed_on %}&#10003;{% endif %}

-      printed centreline </div>

-    <div id="scannedPassageSketch" class="menuBarItem"> {% if planSketches %}&#10003;{% 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>

- </div>

-{% endif %}

-{% endblock %}

-

-

-{% block content %}

-<div id="mainContent" style="background:white">

-

-  <div id="progressTableContent" class="behind">

-  <h3>Survey progress table for {{ current_expedition }}</h3>

-  {% if current_expedition.survey_set.all %} <!-- if there are any surveys in the expedition, make the table -->

-    <table class="centre">

-      <tr>

-        <th> </th>

-        {% for survey in current_expedition.survey_set.all %}

-        <th> {{ survey.wallet_number }} </th>

-        {% endfor %} </tr>

-      <tr>

-        <td> Notes </td>

-        {% for survey in current_expedition.survey_set.all %}

-        <td> {% if survey.notes %}

-          &#10003;

-          {% endif %} </td>

-        {% endfor %} </tr>

-      <tr>

-        <td> Survex file </td>

-        {% for survey in current_expedition.survey_set.all %}

-        <td> {% if survey.survex_file %}

-          &#10003;

-          {% endif %} </td>

-        {% endfor %} </tr>

-      <tr>

-        <td> Plans </td>

-        {% for survey in current_expedition.survey_set.all %}

-        <td> {% if survey.plans %}

-          &#10003;

-          {% endif %} </td>

-        {% endfor %} </tr>

-      <tr>

-        <td> Elevations </td>

-        {% for survey in current_expedition.survey_set.all %}

-        <td> {% if survey.elevations %}

-          &#10003;

-          {% endif %} </td>

-        {% endfor %} </tr>

-    </table>

-	{% else %}

-		<center>[ There are no surveys in the database for this year. Put link in to add one. ]</center>

-	{% endif %}

-  </div>

-  <div id="notesContent" class="behind" >

-    <h3>Scanned notes for {{ current_survey }}.</h3>

-    {% for noteItem in notes %}

-    <div class="figure">

-      <p> <img src="{{ noteItem.thumbnail_image.url }}" class="thumbnail">

-      <p> File at: <a href="{{ noteItem.correctURL }}"> {{ noteItem.file.name }} </a> <br />

-        Scanned by: {{ noteItem.scanned_by }} <br />

-        On: {{ noteItem.scanned_on }} <br />

-      </p>

-      </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>

-  <br class="clearfloat" />

-  <div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />

-    who entered by </div>

-  <div id="printedCentrelineContent" class="behind"> centreline </div>

-  <div id="scannedPassageSketchContent" class="behind">

-    <h3>Scanned plan sketch files for {{ current_survey }}.</h3>

-    {% for sketchItem in planSketches %}

-    <div class="figure">

-      <p> <img src="{{ sketchItem.thumbnail_image.url }}" class="thumbnail" />

-      <p> File at: <a href="{{ sketchItem.correctURL }}"> {{ sketchItem.file.name }} </a> <br />

-        Scanned by: {{ sketchItem.scanned_by }} <br />

-        On: {{ sketchItem.scanned_on }} <br />

-      </p>

-      </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 sketch. </a>  </div>

-  </div>

-  <div id="tunnelXMLfileContent" class="behind"> link to tunnel xml file. potentially instance of tunnel applet... </div>

-  <div id="mainSketchIntegrationContent" class="behind"> link to main sketch file </div>

-  <!-- end #mainContent -->

-</div>

-<br class="clearfloat" />

-

-{% endblock %}

+{% extends "base.html" %}
+{% load wiki_markup %}
+
+
+{% block title %}CUCC Virtual Survey Binder: {{ current_expedition }}{{ current_survey }}{%endblock%}
+{% block head %}
+
+<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/nav.css" />
+
+<script language="javascript">
+	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">
+  CUCC Expo virtual survey binder:
+  {% if current_survey %}
+  {{current_survey}}
+  {% else %}
+  {{current_expedition}}
+  {% endif %}
+</div>
+
+{% block nav %}
+  <br />
+
+  <h3>Choose a year</h3>
+	<center>
+  <select id="expeditionChooser" class="centre" onChange="redirectYear()">
+    
+	<option value=""/>
+	{% for expedition in expeditions %}   	
+    <option label="{{ expedition }}" value="{{ expedition }}" {% ifequal expedition current_expedition %}selected{% endifequal %}>
+    
+	    {{ expedition }}
+    
+    </option>   
+    {% endfor %}
+  
+  </select>
+  	</center>
+
+  <div>
+<!--  	<h4>Click to toggle:</h4>-->
+    <div id="progressTable" class="menuBarItem"> {% if current_expedition.survey_set.all %}&#10003;{% endif %}
+      survey progress table </div>
+  </div>      
+{% if current_expedition %}    
+   <h3>Choose a wallet number   </h3>
+   <center>
+     <select id="surveyChooser" class="centre" onChange="redirectSurvey()">
+    <option label="show all" value="">
+
+    </option>
+         {% for survey in current_expedition.survey_set.all %}
+         
+    <option label="{{ survey }}" value="{{ survey.wallet_number }}" 
+    		{% ifequal survey current_survey %}
+    			selected
+	        {% endifequal %}>
+            {{ survey }}
+	</option>
+    
+    {% endfor %}
+        
+    <option label="add" value="add">
+  </select>
+
+  </center>
+      	<h4>Click to toggle:</h4>
+  <div id="surveyWalletNav">
+    <div id="notes" class="menuBarItem"> {% if notes %}&#10003;{% endif %}
+      scanned notes </div>
+    <div id="survexFile" class="menuBarItem"> {% if current_survey.survex_file %}&#10003;{% endif %}
+      survex file </div>
+    <div id="printedCentreline" class="menuBarItem"> {% if current_survey.centreline_printed_on %}&#10003;{% endif %}
+      printed centreline </div>
+    <div id="scannedPassageSketch" class="menuBarItem"> {% if planSketches %}&#10003;{% 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>
+ </div>
+{% endif %}
+{% endblock %}
+
+
+{% block content %}
+<div id="mainContent" style="background:white">
+
+  <div id="progressTableContent" class="behind">
+  <h3>Survey progress table for {{ current_expedition }}</h3>
+  {% if current_expedition.survey_set.all %} <!-- if there are any surveys in the expedition, make the table -->
+    <table class="centre">
+      <tr>
+        <th> </th>
+        {% for survey in current_expedition.survey_set.all %}
+        <th> {{ survey.wallet_number }} </th>
+        {% endfor %} </tr>
+      <tr>
+        <td> Notes </td>
+        {% for survey in current_expedition.survey_set.all %}
+        <td> {% if survey.notes %}
+          &#10003;
+          {% endif %} </td>
+        {% endfor %} </tr>
+      <tr>
+        <td> Survex file </td>
+        {% for survey in current_expedition.survey_set.all %}
+        <td> {% if survey.survex_file %}
+          &#10003;
+          {% endif %} </td>
+        {% endfor %} </tr>
+      <tr>
+        <td> Plans </td>
+        {% for survey in current_expedition.survey_set.all %}
+        <td> {% if survey.plans %}
+          &#10003;
+          {% endif %} </td>
+        {% endfor %} </tr>
+      <tr>
+        <td> Elevations </td>
+        {% for survey in current_expedition.survey_set.all %}
+        <td> {% if survey.elevations %}
+          &#10003;
+          {% endif %} </td>
+        {% endfor %} </tr>
+    </table>
+	{% else %}
+		<center>[ There are no surveys in the database for this year. Put link in to add one. ]</center>
+	{% endif %}
+  </div>
+  <div id="notesContent" class="behind" >
+    <h3>Scanned notes for {{ current_survey }}.</h3>
+    {% for noteItem in notes %}
+    <div class="figure">
+      <p> <img src="{{ noteItem.thumbnail_image.url }}" class="thumbnail">
+      <p> File at: <a href="{{ noteItem.correctURL }}"> {{ noteItem.file.name }} </a> <br />
+        Scanned by: {{ noteItem.scanned_by }} <br />
+        On: {{ noteItem.scanned_on }} <br />
+      </p>
+      </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>
+  <br class="clearfloat" />
+  <div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />
+    who entered by </div>
+  <div id="printedCentrelineContent" class="behind"> centreline </div>
+  <div id="scannedPassageSketchContent" class="behind">
+    <h3>Scanned plan sketch files for {{ current_survey }}.</h3>
+    {% for sketchItem in planSketches %}
+    <div class="figure">
+      <p> <img src="{{ sketchItem.thumbnail_image.url }}" class="thumbnail" />
+      <p> File at: <a href="{{ sketchItem.correctURL }}"> {{ sketchItem.file.name }} </a> <br />
+        Scanned by: {{ sketchItem.scanned_by }} <br />
+        On: {{ sketchItem.scanned_on }} <br />
+      </p>
+      </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 sketch. </a>  </div>
+  </div>
+  <div id="tunnelXMLfileContent" class="behind"> link to tunnel xml file. potentially instance of tunnel applet... </div>
+  <div id="mainSketchIntegrationContent" class="behind"> link to main sketch file </div>
+  <!-- end #mainContent -->
+</div>
+<br class="clearfloat" />
+
+{% endblock %}