summaryrefslogtreecommitdiffstats
path: root/templates/personexpedition.html
diff options
context:
space:
mode:
authorWookey <wookey@wookware.org>2011-07-11 02:10:22 +0100
committerWookey <wookey@wookware.org>2011-07-11 02:10:22 +0100
commitdc1327674c2676db02ccf525725019cd9115b699 (patch)
tree8b3a151a8512576ccfb6bb6578fe124c033c46c0 /templates/personexpedition.html
parentc8ff8e3ef60c6eba0071e20664268c790c6a6aa6 (diff)
downloadtroggle-dc1327674c2676db02ccf525725019cd9115b699.tar.gz
troggle-dc1327674c2676db02ccf525725019cd9115b699.tar.bz2
troggle-dc1327674c2676db02ccf525725019cd9115b699.zip
remove all the DOS linefeeds
Diffstat (limited to 'templates/personexpedition.html')
-rw-r--r--templates/personexpedition.html114
1 files changed, 57 insertions, 57 deletions
diff --git a/templates/personexpedition.html b/templates/personexpedition.html
index 78018db..b88f44e 100644
--- a/templates/personexpedition.html
+++ b/templates/personexpedition.html
@@ -1,57 +1,57 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-{% load link %}
-
-{% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
-
-
-{% block content %}
-<h1>
- <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person}}</a> :
- <a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a>
-</h1>
-
-<p>{{message}}</p>
-
-<p><b>Other years:</b>
-{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
- {% ifequal otherpersonexpedition personexpedition %}
- | <b>{{otherpersonexpedition.expedition.year}}</b>
- {% else %}
- | <a href="{{otherpersonexpedition.get_absolute_url}}">{{ otherpersonexpedition.expedition.year }}</a>
- {% endifequal %}
-{% endfor %}
-</p>
-
-<h3>Table of all trips and surveys aligned by date</h3>
-<div>
-<table class="survexcontibutions">
-<tr><th>Date</th><th colspan="2">Trips</th><th colspan="2">Surveys</th></tr>
-{% for persondate in personchronology %}
-<tr>
- <td class="date">{{persondate.0}}</td>
-
- {% if persondate.1 %}
- <td class="trip"><a href="{{ persondate.1.logbook_entry.get_absolute_url }}">{{persondate.1.logbook_entry.title|safe}}</a></td>
- <td><a href="{{ persondate.1.logbook_entry.cave.get_absolute_url }}">{{persondate.1.place|safe}}</a></td>
- {% else %}
- <td colspan="2"> </td>
- {% endif %}
-
- {% if persondate.2 %}
- <td class="survexblock"><a href="{% url svx persondate.2.survexfile.path %}">{{persondate.2}}</a></td>
- <td class="roles">
- {% for survexpersonrole in persondate.2.survexpersonrole_set.all %}
- {{survexpersonrole.nrole}}
- {% endfor %}
- </td>
- {% else %}
- <td colspan="2"> </td>
- {% endif %}
-
-</tr>
-{% endfor %}
-</table>
-</div>
-
-{% endblock %}
+{% extends "base.html" %}
+{% load wiki_markup %}
+{% load link %}
+
+{% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
+
+
+{% block content %}
+<h1>
+ <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person}}</a> :
+ <a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a>
+</h1>
+
+<p>{{message}}</p>
+
+<p><b>Other years:</b>
+{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
+ {% ifequal otherpersonexpedition personexpedition %}
+ | <b>{{otherpersonexpedition.expedition.year}}</b>
+ {% else %}
+ | <a href="{{otherpersonexpedition.get_absolute_url}}">{{ otherpersonexpedition.expedition.year }}</a>
+ {% endifequal %}
+{% endfor %}
+</p>
+
+<h3>Table of all trips and surveys aligned by date</h3>
+<div>
+<table class="survexcontibutions">
+<tr><th>Date</th><th colspan="2">Trips</th><th colspan="2">Surveys</th></tr>
+{% for persondate in personchronology %}
+<tr>
+ <td class="date">{{persondate.0}}</td>
+
+ {% if persondate.1 %}
+ <td class="trip"><a href="{{ persondate.1.logbook_entry.get_absolute_url }}">{{persondate.1.logbook_entry.title|safe}}</a></td>
+ <td><a href="{{ persondate.1.logbook_entry.cave.get_absolute_url }}">{{persondate.1.place|safe}}</a></td>
+ {% else %}
+ <td colspan="2"> </td>
+ {% endif %}
+
+ {% if persondate.2 %}
+ <td class="survexblock"><a href="{% url svx persondate.2.survexfile.path %}">{{persondate.2}}</a></td>
+ <td class="roles">
+ {% for survexpersonrole in persondate.2.survexpersonrole_set.all %}
+ {{survexpersonrole.nrole}}
+ {% endfor %}
+ </td>
+ {% else %}
+ <td colspan="2"> </td>
+ {% endif %}
+
+</tr>
+{% endfor %}
+</table>
+</div>
+
+{% endblock %}