diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 8 | ||||
| -rw-r--r-- | templates/calendar.html | 71 | ||||
| -rw-r--r-- | templates/expedition.html | 110 | ||||
| -rw-r--r-- | templates/logbook2005style.html | 2 | ||||
| -rw-r--r-- | templates/logbookentry.html | 4 | ||||
| -rw-r--r-- | templates/tunnelfiles.html | 20 |
6 files changed, 92 insertions, 123 deletions
diff --git a/templates/base.html b/templates/base.html index 10e670c..302aa25 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,6 +18,7 @@ <div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
<div id="editLinks"> {% block loginInfo %}
+ <a href="{{ settings.URL_ROOT }}">Home</a> |
{% if user.username %}
You are logged in as {{ user.username }}
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
@@ -25,15 +26,15 @@ {% 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%}
- | <a href="{{ settings.URL_ROOT }}">Home</a> | <a class="killEyeCandy">Kill Eyecandy</a><a class="showEyeCandy" style="display: none;">Show Eyecandy</a>
{% block editLink %}
{% endblock %}
</div>
</div>
<div class="toolbarlinks">
- <a href="{% url survexcaveslist %}">All Cave Survex</a> |
- <a href="{% url surveyscansfolders %}">All scans</a> |
+ <a href="{% url survexcaveslist %}">All Survex</a> |
+ <a href="{% url surveyscansfolders %}">Scans</a> |
+ <a href="{% url tunneldata %}">Tunneldata</a> |
<a href="{% url survexcavessingle 161 %}">161</a> |
<a href="{% url survexcavessingle 204 %}">204</a> |
<a href="{% url survexcavessingle 258 %}">258</a> |
@@ -95,7 +96,6 @@ <li><a href="{% url stats %}">statistics</a></li>
</ul>
</li>
- <li><a href="{% url calendar 2008 %}">expedition calendar</a></li>
<li><a href="#">admin</a>
<ul class="sub_menu">
<li><a id="cuccLink" href="{% url controlpanel %}">Import / export data</a></li>
diff --git a/templates/calendar.html b/templates/calendar.html deleted file mode 100644 index 4e22e78..0000000 --- a/templates/calendar.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "base.html" %}
-
-{% block title %}
- CUCC expedition calendar:
- {% if expedition %}
- {{ expedition.year }}
- {% else %}
- choose a year
- {% endif %}
-{% endblock %}
-
-{% block head %}
-<style type="text/css">
-<!--
-.no { background: #7f96e8; width: 80pt; font-size: 10pt }
-.yes { background: #ff6666; width: 80pt; font-size: 10pt }
-.name { background: #999; width: 80pt; text-align:right; font-size: 10pt }
-.date { background: #999; width: 80pt; text-align:right; font-size: 10pt }
--->
-</style>
-
-{% endblock %}
-
-{% block contentheader %}
- <h2>Expedition members present calendar for {{ expedition.year }}</h2>
- <table style="margin:0 auto">
- <tr>
- <td class='yes' width="10"></td><td>Expedition member present in Austria</td>
- </tr>
- <tr>
- <td class='no' width="10"></td><td>Expedition member absent in Austria</td>
- </tr></table>
- <br />
-{% endblock%}
-
-{% block content %}
- {% if expedition %}
- <table>
- <tr><td />
- {% for date in listdays %}
- {% ifchanged date.month %}
- <td class="date">{{ date|date:"F" }}</td>
- {% else %}
- <td class="date"></td>
- {% endifchanged %}
- {% endfor %}
- </tr>
- <tr><td />
- {% for date in listdays %}
- <td class="date">{{ date|date:"D" }}</td>
- {% endfor %}
- </tr>
- <tr><td />
- {% for date in listdays %}
- <td class="date">{{ date|date:"d" }}</td>
- {% endfor %}
- </tr>
-
- {% for personexpedition, pelistdays in personexpeditiondays %}
- <tr>
- <td class="name">
- <a href="{{ personexpedition.person.get_absolute_url }}">{{ personexpedition.person }}</a>
- </td>
- {% for peday in pelistdays %}
- <td {{ peday|yesno:"class='yes',class='no'"|safe }}></td>
- {% endfor %}
- </tr>
- {% endfor %}
- </table>
- {% endif %}
-{% endblock %}
diff --git a/templates/expedition.html b/templates/expedition.html index 3a917bb..fd78eea 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -6,64 +6,84 @@ {% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
{% block related %}
-<table class="prevnextexpeditions">
-<tr>
- <td>{% if expedition_prev %}< < {{ expedition_prev|link }} {% endif %}</td>
- <td>{% if expedition_next %}> > {{ expedition_next|link }} {% 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>
{% endblock %}
{% block content %}
-<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>
-
-<div id="col1">
-<h3>Logbook entries</h3>
-<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
+{% if message %}
<p>debug message: {{message}}</p>
+{% endif %}
-<table class="expeditionlogbooks">
-<tr><th>Date</th><th>Title</th><th>Author</th><th>Place</th></tr>
-{% for logbookentry in logbookentries %}
+<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>{{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>
+ <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 %}
- {% if logbookentry.cave %}
- <td><a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</a></td>
- {% else %}
- <td>{{logbookentry.place}}</td>
- {% endif %}
+ {% endfor %}
</tr>
{% endfor %}
</table>
-</div>
-<div>
-<h3 id="surveysdone">Surveys done</h3>
-<table class="survextrip">
-<tr><th>Date</th><th>Name</th><th>Length</th></tr>
-{% for survexblock in expedition.survexblock_set.all %}
- <tr>
- <td>{{survexblock.date}}</td>
- <td><a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a></td>
- <td>{{survexblock.totalleglength}}</td>
- </tr>
+<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
+
+<h3>Logbooks and survey trips per day</h3>
+<table class="expeditionlogbooks">
+<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
+{% for expeditionday in expedition.expeditionday_set.all %}
+<tr>
+ <td>{{expeditionday.date}}</td>
+ <td>
+ {% for logbookentry in expeditionday.logbookentry_set.all %}
+ <a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</a><br/>
+ {% endfor %}
+ </td>
+ <td>
+ {% for survexblock in expeditionday.survexblock_set.all %}
+ <a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a>
+ {% endfor %}
+ </td>
+</tr>
{% endfor %}
</table>
-</div>
{% endblock %}
diff --git a/templates/logbook2005style.html b/templates/logbook2005style.html index 39205f1..b0cb240 100644 --- a/templates/logbook2005style.html +++ b/templates/logbook2005style.html @@ -17,7 +17,7 @@ p { clear: both } <div class="tripdate" id="t{{logbook_entry.date}}A">{{logbook_entry.date}}</div>
<div class="trippeople"><u>{{logbook_entry.author.person}}</u>
-{% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.person_expedition.person }} {{ persontrip.person_expedition.time_underground }}, {% endfor %}
+{% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.personexpedition.person }} {{ persontrip.personexpedition.time_underground }}, {% endfor %}
</div>
<div class="triptitle">{{logbook_entry.place}} - {{logbook_entry.title}}</div>
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 578786f..03fc37e 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -29,12 +29,12 @@ <tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
{% for persontrip in logbookentry.persontrip_set.all %}
<tr>
- {% ifequal persontrip.person_expedition logbookentry.author %}
+ {% ifequal persontrip.personexpedition logbookentry.author %}
<td class="author">
{% else %}
<td>
{% endifequal %}
- <a href="{{ persontrip.person_expedition.get_absolute_url }}">{{persontrip.person_expedition.person}}</a>
+ <a href="{{ persontrip.personexpedition.get_absolute_url }}">{{persontrip.personexpedition.person}}</a>
</td>
<td>
diff --git a/templates/tunnelfiles.html b/templates/tunnelfiles.html new file mode 100644 index 0000000..34afc28 --- /dev/null +++ b/templates/tunnelfiles.html @@ -0,0 +1,20 @@ +{% extends "base.html" %}
+{% load wiki_markup %}
+{% load survex_markup %}
+
+{% block title %}Tunnel files{% endblock %}
+
+{% block content %}
+
+<h3>All Tunnel files</h3>
+<table>
+<tr><th>File</th><th>Font</th><th>Frame</th><th>SurvexBlocks</th><th>Size</th></tr>
+{% for tunnelfile in tunnelfiles %}
+ <tr>
+ <td>{{tunnelfile.tunnelpath}}</td>
+ <td>{{tunnelfile.bfontcolours}}</td>
+ </tr>
+{% endfor %}
+</table>
+
+{% endblock %}
\ No newline at end of file |