expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-04-02 10:11:00 +01:00
Code Issues 18 Projects 3 Activity

[svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views.

Browse Source
This commit is contained in:
substantialnoninfringinguser
2009-07-03 00:50:56 +01:00
parent 9deaad4437
commit b69ae42ef2
11 changed files with 56 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/expedition.html
View File

@@ -1,16 +1,15 @@
{% extends "base.html" %}
{% load wiki_markup %}
{% load link %}
{% block title %}Expedition {{expedition.name}}{% endblock %}
{% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
{% block content %}
<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
<div id="col2">
{% block related %}
<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>
<td>{% if expedition_prev %}&lt; &lt; {{ expedition_prev|link }} {% endif %}</td>
<td>{% if expedition_next %}&gt; &gt; {{ expedition_next|link }} {% endif %}</td>
</tr>
</ul>
@@ -24,7 +23,11 @@
</tr>
{% endfor %}
</table>
</div>
{% endblock %}
{% block content %}
<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
<div id="col1">
<h3>Logbook entries</h3>