[svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc.

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM

4 files changed, 8 insertions, 8 deletions

diff --git a/templates/base.html b/templates/base.html
index c44212f..2a8e758 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,7 +19,7 @@
     {% if user.username %}

     You are logged in as {{ user.username }} 

     	{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)

-        	{% else %} <a href="{% url profiles_create_profile %}">sort your profile</a>

+        	{% else %} <a href={% url profiles_select_profile %}>sort your profile</a>

         {% endif %}.

     | <a href="{% url auth_logout %}">Log out</a> {% else %} <a href="{% url registration_register %}">Sign up</a> | <a href="{% url auth_login %}">Log in</a> {% endif %}

     {% endblock%}

diff --git a/templates/controlPanel.html b/templates/controlPanel.html
index 3fad8e6..d60a327 100644
--- a/templates/controlPanel.html
+++ b/templates/controlPanel.html
@@ -13,7 +13,7 @@
 <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>

-<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_folk"/></td></tr>

+<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_people"/></td></tr>

 <tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="QMs" value="import_QMs" /></td></tr>

 <tr><td>survey scans using parsers\surveys.py</td><td><input type="checkbox" name="import_surveys" /></td></tr>

 <tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="survex" value="import_survex" /></td></tr>

diff --git a/templates/person.html b/templates/person.html
index d28f82a..adc6aba 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -11,13 +11,13 @@
 

 {% block content %}

 {% if person.blurb %}

-{{person.blurb}}

+{{person.blurb|safe}}

 {% endif %}

 

 {% for pic in person.photo_set.all %}

 {% if pic.is_mugshot %}

     <div class="figure">

-      <p> <img src="{{ pic.file.url }}" class="thumbnail" />

+      <p> <img src="{{ pic.thumbnail_image.url }}" class="thumbnail" />

       <p> {{ pic.caption }}

       </p>

       </p>

diff --git a/templates/survey.html b/templates/survey.html
index fcdf65e..a0395b6 100644
--- a/templates/survey.html
+++ b/templates/survey.html
@@ -179,11 +179,11 @@
 		<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">

+  <div id="notesContent" class="behind" style="overflow: auto">

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

     {% for noteItem in notes %}

     <div class="figure">

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

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

@@ -201,8 +201,8 @@
     <h3>Scanned plan sketch files for {{ current_survey }}.</h3>

     {% for sketchItem in planSketches %}

     <div class="figure">

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

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

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