diff options
author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:52:15 +0100 |
---|---|---|
committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:52:15 +0100 |
commit | d25fd97864611c3be326412ae4aa84e8ad01cd66 (patch) | |
tree | 0062d37e453ad21f98411f9a208e3c6b344412c7 /templates/survey.html | |
parent | 3b35b6bb76f41f9c086e43d31f45aee25403a507 (diff) | |
download | troggle-d25fd97864611c3be326412ae4aa84e8ad01cd66.tar.gz troggle-d25fd97864611c3be326412ae4aa84e8ad01cd66.tar.bz2 troggle-d25fd97864611c3be326412ae4aa84e8ad01cd66.zip |
[svn] My crusade to make our project more Djangoic.
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers.
Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views.
I also eliminated a couple of unnecessary methods and stuff like that.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
Diffstat (limited to 'templates/survey.html')
-rw-r--r-- | templates/survey.html | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/templates/survey.html b/templates/survey.html index 8f9e190..e2e8c80 100644 --- a/templates/survey.html +++ b/templates/survey.html @@ -85,7 +85,7 @@ select { margin:0.5em } <center>
<select id="expeditionChooser" class="centre" onChange="redirectYear()">
- {% for expedition in expeditions.reverse %}
+ {% for expedition in expeditions %}
<option label="{{ expedition }}" value="{{ expedition }}" {% ifequal expedition current_expedition %}selected{% endifequal %}>
@@ -103,9 +103,9 @@ select { margin:0.5em } survey progress table </div>
</div>
- <h3>Choose a wallet number</h3>
- <center>
- <select id="surveyChooser" class="centre" onChange="redirectSurvey()">
+ <h3>Choose a wallet number </h3>
+ <center>
+ <select id="surveyChooser" class="centre" onChange="redirectSurvey()">
<option label="show all" value="">
{% for survey in current_expedition.survey_set.all %}
</option>
@@ -113,6 +113,7 @@ select { margin:0.5em } {% ifequal survey current_survey %}
selected
{% endifequal %}>
+ {{ survey }}
</option>
{% endfor %}
@@ -195,8 +196,9 @@ select { margin:0.5em } </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> (to be improved) </div>
+ <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>
@@ -212,7 +214,7 @@ select { margin:0.5em } </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> (to be improved) </div>
+ <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>
|