[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

1 files changed, 52 insertions, 52 deletions

diff --git a/templates/expedition.html b/templates/expedition.html
index e4f12f0..b6be4ac 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -1,52 +1,52 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-
-{% block title %}Expedition {{expedition.name}}{% endblock %}
-
-{% block content %}
-<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
-
-<div id="col2">
-<table class="prevnextexpeditions">
-<tr>
-  <td>{% if expedition_prev %}&lt; &lt; <a href="{% url expedition expedition_prev.year %}">{{expedition_prev.year}}</a>{% endif %}</td>
-  <td>{% if expedition_next %}&gt; &gt; <a href="{% url expedition expedition_next.year %}">{{expedition_next.year}}</a>{% endif %}</td>
-</tr>
-</ul>
-
-<table class="expeditionpersonlist">
-<tr><th>Caver</th><th>From</th><th>To</th></tr>
-{% for personexpedition in expedition.personexpedition_set.all %}
-  <tr>
-    <td><a href="{% url personexpedition personexpedition.person.href personexpedition.expedition.year %}">{{personexpedition.person}}</a></td>
-    <td>{{personexpedition.date_from}}</td>
-    <td>{{personexpedition.date_to}}</td>
-  </tr>
-{% endfor %}
-</table>
-</div>
-
-<div id="col1">
-<h3>Logbook entries</h3>
-<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
-<p>debug message: {{message}}</p>
-
-<table class="expeditionlogbooks">
-<tr><th>Date</th><th>Title</th><th>Author</th><th>Place</th></tr>
-{% for logbookentry in logbookentries %}
-  <tr>
-    <td>{{logbookentry.date}}</td>
-    <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</td>
-    <td><a href="{% url personexpedition logbookentry.author.person.href logbookentry.author.expedition.year %}">{{logbookentry.author.name}}</a></td>
-
-    {% if logbookentry.cave %}
-      <td><a href="{% url cave logbookentry.cave.href %}">{{logbookentry.place}}</a></td>
-    {% else %}
-      <td>{{logbookentry.place}}</td>
-    {% endif %}
-  </tr>
-{% endfor %}
-</table>
-</div>
-
-{% endblock %}
+{% extends "base.html" %}

+{% load wiki_markup %}

+

+{% block title %}Expedition {{expedition.name}}{% endblock %}

+

+{% block content %}

+<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>

+

+<div id="col2">

+<table class="prevnextexpeditions">

+<tr>

+  <td>{% if expedition_prev %}&lt; &lt; <a href="{{ expedition_prev.get_absolute_url }}">{{expedition_prev.year}}</a>{% endif %}</td>

+  <td>{% if expedition_next %}&gt; &gt; <a href="{{ expedition_next.get_absolute_url }}">{{expedition_next.year}}</a>{% endif %}</td>

+</tr>

+</ul>

+

+<table class="expeditionpersonlist">

+<tr><th>Caver</th><th>From</th><th>To</th></tr>

+{% for personexpedition in expedition.personexpedition_set.all %}

+  <tr>

+    <td><a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.person}}</a></td>

+    <td>{{personexpedition.date_from}}</td>

+    <td>{{personexpedition.date_to}}</td>

+  </tr>

+{% endfor %}

+</table>

+</div>

+

+<div id="col1">

+<h3>Logbook entries</h3>

+<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>

+<p>debug message: {{message}}</p>

+

+<table class="expeditionlogbooks">

+<tr><th>Date</th><th>Title</th><th>Author</th><th>Place</th></tr>

+{% for logbookentry in logbookentries %}

+  <tr>

+    <td>{{logbookentry.date}}</td>

+    <td><a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</td>

+    <td><a href="{{ logbookentry.author.get_absolute_url }}">{{logbookentry.author.name}}</a></td>

+

+    {% if logbookentry.cave %}

+      <td><a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</a></td>

+    {% else %}

+      <td>{{logbookentry.place}}</td>

+    {% endif %}

+  </tr>

+{% endfor %}

+</table>

+</div>

+

+{% endblock %}