[svn]

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM

2 files changed, 11 insertions, 12 deletions

diff --git a/expo/models.py b/expo/models.py
index e5eb87c..88201e2 100644
--- a/expo/models.py
+++ b/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/templates/survey.html b/templates/survey.html
index 5d9a447..e4998f3 100644
--- a/templates/survey.html
+++ b/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 />