diff options
Diffstat (limited to 'templates/expedition.html')
-rw-r--r-- | templates/expedition.html | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/templates/expedition.html b/templates/expedition.html index 814b77e..4fab025 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -1,87 +1,87 @@ -{% 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 related %}
-{% endblock %}
-
-{% block content %}
-
-{% if message %}
-<p>debug message: {{message}}</p>
-{% endif %}
-
-<h2>{{expedition.name}}</h2>
-
-<p><b>Other years:</b>
-{% for otherexpedition in expeditions %}
- {% ifequal otherexpedition expedition %}
- | <b>{{otherexpedition.year}}</b>
- {% else %}
- | <a href="{{otherexpedition.get_absolute_url}}">{{ otherexpedition.year }}</a>
- {% endifequal %}
-{% endfor %}
-</p>
-
-<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.
-The columns are the date in the month (July or August), with a "T" for a logbook entry, and
-an "S" for a survey trip. The colours are the same for people on the same trip.</p>
-
-<table class="expeditionpersonlist">
-<tr>
-<th>Caver</th>
-{% for expeditionday in expedition.expeditionday_set.all %}
-<th>
- {{expeditionday.date.day}}
-</th>
-{% endfor %}
-</tr>
-{% for personexpeditionday in personexpeditiondays %}
- <tr>
- <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td>
- {% for persondayactivities in personexpeditionday.personrow %}
-
- {% if persondayactivities.persontrips or persondayactivities.survexblocks %}
- <td class="persondayactivity">
- {% for persontrip in persondayactivities.persontrips %}
- <a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a>
- {% endfor %}
- <br/>
- {% for survexblock in persondayactivities.survexblocks %}
- <a href="{% url svx survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>
- {% endfor %}
- </td>
- {% else %}
- <td class="persondayactivity-nothing">
- </td>
- {% endif %}
-
- {% endfor %}
- </tr>
-{% endfor %}
-</table>
-
-<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
-
-<h3>Logbooks and survey trips per day</h3>
-<a href="{% url newLogBookEntry expeditionyear=expedition.year %}">New logbook entry</a>
-<table class="expeditionlogbooks">
-<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
-{% regroup dateditems|dictsort:"date" by date as dates %}
-{% for date in dates %}
-<tr>
-<td>{{date.grouper}}</td>
-<td>{% for item in date.list %}
- {% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
- {% endfor %}</td>
-<td>{% for item in date.list %}
- {% if item.isSurvexBlock %}<a href="{% url svx item.survexfile.path %}">{{item.name}}</a><br/>{% endif %}
- {% endfor %}</td>
-</tr>
-{% endfor %}
-</table>
-
-{% endblock %}
+{% 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 related %} +{% endblock %} + +{% block content %} + +{% if message %} +<p>debug message: {{message}}</p> +{% endif %} + +<h2>{{expedition.name}}</h2> + +<p><b>Other years:</b> +{% for otherexpedition in expeditions %} + {% ifequal otherexpedition expedition %} + | <b>{{otherexpedition.year}}</b> + {% else %} + | <a href="{{otherexpedition.get_absolute_url}}">{{ otherexpedition.year }}</a> + {% endifequal %} +{% endfor %} +</p> + +<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips. +The columns are the date in the month (July or August), with a "T" for a logbook entry, and +an "S" for a survey trip. The colours are the same for people on the same trip.</p> + +<table class="expeditionpersonlist"> +<tr> +<th>Caver</th> +{% for expeditionday in expedition.expeditionday_set.all %} +<th> + {{expeditionday.date.day}} +</th> +{% endfor %} +</tr> +{% for personexpeditionday in personexpeditiondays %} + <tr> + <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td> + {% for persondayactivities in personexpeditionday.personrow %} + + {% if persondayactivities.persontrips or persondayactivities.survexblocks %} + <td class="persondayactivity"> + {% for persontrip in persondayactivities.persontrips %} + <a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a> + {% endfor %} + <br/> + {% for survexblock in persondayactivities.survexblocks %} + <a href="{% url svx survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a> + {% endfor %} + </td> + {% else %} + <td class="persondayactivity-nothing"> + </td> + {% endif %} + + {% endfor %} + </tr> +{% endfor %} +</table> + +<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form> + +<h3>Logbooks and survey trips per day</h3> +<a href="{% url newLogBookEntry expeditionyear=expedition.year %}">New logbook entry</a> +<table class="expeditionlogbooks"> +<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr> +{% regroup dateditems|dictsort:"date" by date as dates %} +{% for date in dates %} +<tr> +<td>{{date.grouper}}</td> +<td>{% for item in date.list %} + {% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %} + {% endfor %}</td> +<td>{% for item in date.list %} + {% if item.isSurvexBlock %}<a href="{% url svx item.survexfile.path %}">{{item.name}}</a><br/>{% endif %} + {% endfor %}</td> +</tr> +{% endfor %} +</table> + +{% endblock %} |