diff options
author | Wookey <wookey@wookware.org> | 2011-07-11 02:10:22 +0100 |
---|---|---|
committer | Wookey <wookey@wookware.org> | 2011-07-11 02:10:22 +0100 |
commit | dc1327674c2676db02ccf525725019cd9115b699 (patch) | |
tree | 8b3a151a8512576ccfb6bb6578fe124c033c46c0 /templates/logbookentry.html | |
parent | c8ff8e3ef60c6eba0071e20664268c790c6a6aa6 (diff) | |
download | troggle-dc1327674c2676db02ccf525725019cd9115b699.tar.gz troggle-dc1327674c2676db02ccf525725019cd9115b699.tar.bz2 troggle-dc1327674c2676db02ccf525725019cd9115b699.zip |
remove all the DOS linefeeds
Diffstat (limited to 'templates/logbookentry.html')
-rw-r--r-- | templates/logbookentry.html | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 04229fb..a3ffc3d 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -1,77 +1,77 @@ -{% extends "base.html" %}
-{% load wiki_markup %}
-
-{% block title %}Logbook {{logbookentry.id}}{% endblock %}
-{% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}
-{% block content %}
-
-{% block related %}{% endblock %}
-{% block nav %}{% endblock %}
-<h2>{{logbookentry.title}}</h2>
-
-<div id="related">
-<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>
-
-{% if logbookentry.cave %}
- <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p>
-{% else %}
- <p>{{logbookentry.place}}</p>
-{% endif %}
-
-<p>
- {% if logbookentry.get_previous_by_date %}
- <a href="{{ logbookentry.get_previous_by_date.get_absolute_url }}">{{logbookentry.get_previous_by_date.date}}</a>
- {% endif %}
- {% if logbookentry.get_next_by_date %}
- <a href="{{ logbookentry.get_next_by_date.get_absolute_url }}">{{logbookentry.get_next_by_date.date}}</a>
- {% endif %}
-</p>
-
-<table class="cavers">
-<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.personexpedition logbookentry.author %}
- <td class="author">
- {% else %}
- <td>
- {% endifequal %}
- <a href="{{ persontrip.personexpedition.get_absolute_url }}">{{persontrip.personexpedition.person}}</a>
- </td>
-
- <td>
- {% if persontrip.timeunderground %}
- - T/U {{persontrip.timeunderground}}</p>
- {% endif %}
- </td>
-
- <td>
- {% if persontrip.persontrip_prev %}
- <a href="{{ persontrip.persontrip_prev.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_prev.logbook_entry.date}}</a>
- {% endif %}
- </td>
- <td>
- {% if persontrip.persontrip_next %}
- <a href="{{ persontrip.persontrip_next.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_next.logbook_entry.date}}</a>
- {% endif %}
- </td>
-
-</tr>
-{% endfor %}
-</table>
-{% if newQMlink %}
-<a href="{{newQMlink}}">Add QM found on this trip</a>
-{% endif %}
-</div>
-
-<div id="col1">
-<div class="logbookentry">
-<b>{{logbookentry.date}}</b>
- {{logbookentry.text|wiki_to_html}}</div>
-</div>
-</div>
-
-{% if logbookentry.filename %}<a href="{% url editLogBookEntry expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deleteLogBookEntry expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}
-
-
-{% endblock %}
+{% extends "base.html" %} +{% load wiki_markup %} + +{% block title %}Logbook {{logbookentry.id}}{% endblock %} +{% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %} +{% block content %} + +{% block related %}{% endblock %} +{% block nav %}{% endblock %} +<h2>{{logbookentry.title}}</h2> + +<div id="related"> +<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p> + +{% if logbookentry.cave %} + <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p> +{% else %} + <p>{{logbookentry.place}}</p> +{% endif %} + +<p> + {% if logbookentry.get_previous_by_date %} + <a href="{{ logbookentry.get_previous_by_date.get_absolute_url }}">{{logbookentry.get_previous_by_date.date}}</a> + {% endif %} + {% if logbookentry.get_next_by_date %} + <a href="{{ logbookentry.get_next_by_date.get_absolute_url }}">{{logbookentry.get_next_by_date.date}}</a> + {% endif %} +</p> + +<table class="cavers"> +<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.personexpedition logbookentry.author %} + <td class="author"> + {% else %} + <td> + {% endifequal %} + <a href="{{ persontrip.personexpedition.get_absolute_url }}">{{persontrip.personexpedition.person}}</a> + </td> + + <td> + {% if persontrip.timeunderground %} + - T/U {{persontrip.timeunderground}}</p> + {% endif %} + </td> + + <td> + {% if persontrip.persontrip_prev %} + <a href="{{ persontrip.persontrip_prev.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_prev.logbook_entry.date}}</a> + {% endif %} + </td> + <td> + {% if persontrip.persontrip_next %} + <a href="{{ persontrip.persontrip_next.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_next.logbook_entry.date}}</a> + {% endif %} + </td> + +</tr> +{% endfor %} +</table> +{% if newQMlink %} +<a href="{{newQMlink}}">Add QM found on this trip</a> +{% endif %} +</div> + +<div id="col1"> +<div class="logbookentry"> +<b>{{logbookentry.date}}</b> + {{logbookentry.text|wiki_to_html}}</div> +</div> +</div> + +{% if logbookentry.filename %}<a href="{% url editLogBookEntry expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deleteLogBookEntry expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%} + + +{% endblock %} |