From 73d73a8a41f8734654c3985c7086daeb3ef685a9 Mon Sep 17 00:00:00 2001
From: aaron <devnull@localhost>
Date: Fri, 16 Jan 2009 03:19:09 +0100
Subject: [PATCH] [svn r8157]

---
 troggle/expo/models.py        |  7 ++-----
 troggle/templates/survey.html | 16 +++++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/troggle/expo/models.py b/troggle/expo/models.py
index e5eb87c29..88201e23d 100644
--- a/troggle/expo/models.py
+++ b/troggle/expo/models.py
@@ -309,8 +309,8 @@ def get_scan_path(instance, filename):
 
 class ScannedImage(models.Model): 
     file = models.ImageField(storage=scansFileStorage, upload_to=get_scan_path)
-    scannedBy = models.ForeignKey(Person,blank=True, null=True)
-    scannedOn = models.DateField(null=True)
+    scanned_by = models.ForeignKey(Person,blank=True, null=True)
+    scanned_on = models.DateField(null=True)
     survey = models.ForeignKey('Survey')
     contents = models.CharField(max_length=20,choices=(('notes','notes'),('plan','plan_sketch'),('elevation','elevation_sketch')))
     number_in_wallet = models.IntegerField(null=True)
@@ -326,9 +326,6 @@ class ScannedImage(models.Model):
     
     def __str__(self):
         return get_scan_path(self,'')
-	
-    class admin():
-	    pass
 
 class Survey(models.Model):
     expedition_year = models.ForeignKey('Expedition')
diff --git a/troggle/templates/survey.html b/troggle/templates/survey.html
index 5d9a447de..e4998f3d0 100644
--- a/troggle/templates/survey.html
+++ b/troggle/templates/survey.html
@@ -132,7 +132,9 @@ img.thumbnail {
 	}
 	
 	function unhighlight(div){
-//		div.style.backgroundColor="#EBEBEB";
+		if (div.style.backgroundColor=="#EBEBEB"){
+			div.style.backgroundColor="#EBEBEB";
+		}
 	}
 	
 	function choose(div){
@@ -191,15 +193,15 @@ img.thumbnail {
 </div>
 <div id="mainContent">
   <div id="notesContent" class="behind">
-     There are {{ notes|length }} notes files for {{ current_survey }}.
+     <h2>Scanned notes for {{ current_survey }}.</h2>
 
       {% for noteItem in notes %}
     	<div class="figure">
 	        <p>
-    		  {{ noteItem.file.correctURL }} <img src="{{ noteItem.correctURL }}" class="thumbnail">
+			   <img src="{{ noteItem.correctURL }}" class="thumbnail">
             <p>
                File at: 
-               		<a href="{{ noteItem.file.correctUrl }}">
+               		<a href="{{ noteItem.correctURL }}">
 		               {{ noteItem.file.name }}
                		</a> <br />
                Scanned by: {{ noteItem.scanned_by }} <br />
@@ -220,15 +222,15 @@ img.thumbnail {
     who entered by </div>
   <div id="printedCentrelineContent" class="behind"> centreline </div>
   <div id="scannedPassageSketchContent" class="behind">
-     There are {{ planSketches|length }} plan sketch files for {{ current_survey }}.
+     <h2>Scanned plan sketch files for {{ current_survey }}.</h2>
 
       {% for sketchItem in planSketches %}
     	<div class="figure">
 	        <p>
-    		  {{ sketchItem.file.correctURL }} <img src="{{ sketchItem.correctURL }}" class="thumbnail">
+    		  <img src="{{ sketchItem.correctURL }}" class="thumbnail">
             <p>
                File at: 
-               		<a href="{{ sketchItem.file.correctUrl }}">
+               		<a href="{{ sketchItem.correctUrl }}">
 		               {{ sketchItem.file.name }}
                		</a> <br />
                Scanned by: {{ sketchItem.scanned_by }} <br />