Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves.

This commit is contained in:
Martin Green
2011-07-11 00:15:59 +01:00
parent 8578a3097a
commit 65c55f0f21
10 changed files with 237 additions and 110 deletions

View File

@@ -1,10 +1,92 @@
{% extends "cavebase.html" %}
{% load wiki_markup %}
{% block editLink %}| <a href={{cave.get_admin_url}}>Edit cave {{cave|wiki_to_html_short}}</a>{% endblock %}
{% block content %}
{% block contentheader %}
<table id="cavepage">
<tr>
<th id="kat_no">
{% if cave.kataster_number %}
{{ cave.kataster_number|safe }}
{% if cave.entrancelist %}
- {{ cave.entrancelist|safe }}
{% endif %}
{% if cave.unofficial_number %}
<br />({{ cave.unofficial_number|safe }})
{% endif %}
{% endif %}
</th>
<th id="name">
{{ cave.official_name|safe }}
</th>
<th id="status">
{{ cave.kataster_code|safe }}
</th>
</tr>
</table>
{% block related %}
<h2>All logbook entries regarding this cave ({{cave.logbookentry_set.count}})</h2>
<table>
{% endblock %}{% endblock %}
<div id="tabs">
<ul>
<li><a href="#entrances">Entrances</a></li>
<li><a href="#cave">Cave</a></li>
<li><a href="#logbook">Logbook</a></li>
<li><a href="#qms">QMs</a></li>
</ul>
<div id="entrances">
<p>{% if cave.entrances %}
<h2>Entrances</h2>
{% for ent in cave.entrances %}
<a href = "./{{ ent.entrance_letter|safe }}">{{ ent.entrance_letter|safe }}</a>
{% if ent.entrance.marking %}
Marking: {{ ent.entrance.marking_val|safe }}
{% endif %}
<br>
{% endfor %}
{% endif %}</p>
</div>
<div id="cave">
<p>{% if cave.explorers %}
<h2>Explorers</h2>
{{ cave.explorers|safe }}
{% endif %}
{% if cave.underground_description %}
<h2>Underground Description</h2>
{{ cave.underground_description|safe }}
{% endif %}
{% if cave.equipment %}
<h2>Equipment</h2>
{{ cave.equipment|safe }}
{% endif %}
{% if cave.references %}
<h2>References</h2>
{{ cave.references|safe }}
{% endif %}
{% if cave.survey %}
<h2>Survey</h2>
{{ cave.survey|safe }}
{% endif %}
{% if cave.kataster_status %}
<h2>Kataster_status</h2>
{{ cave.kataster_status|safe }}
{% endif %}
{% if cave.underground_centre_line %}
<h2>Underground Centre Line</h2>
{{ cave.underground_centre_line|safe }}
{% endif %}
{% if cave.survex_file %}
<h2>Survex File</h2>
{{ cave.survex_file|safe }}
{% endif %}
{% if cave.notes %}
<h2>Notes</h2>
{{ cave.notes|safe }}
{% endif %}</p>
</div>
<div id="logbook">
<p>
<table>
{% for logbookentry in cave.logbookentry_set.all %}
{% if logbookentry.title %}
<tr>
@@ -14,59 +96,10 @@
{% endif %}
{% endfor %}
</table>
{% endblock %}
{% block content %}
{% if cave.entrances %}
<h2>Entrances</h2>
{% for ent in cave.entrances %}
<a href = "./{{ ent.entrance_letter|wiki_to_html_short }}">{{ ent.entrance_letter|wiki_to_html_short }}</a>
{% if ent.entrance.marking %}
Marking: {{ ent.entrance.marking_val|wiki_to_html_short }}
{% endif %}
<br>
{% endfor %}
{% endif %}
{% if cave.explorers %}
<h2>Explorers</h2>
{{ cave.explorers|wiki_to_html }}
{% endif %}
{% if cave.underground_description %}
<h2>Underground Description</h2>
{{ cave.underground_description|wiki_to_html }}
{% endif %}
{% if cave.equipment %}
<h2>Equipment</h2>
{{ cave.equipment|wiki_to_html }}
{% endif %}
{% if cave.references %}
<h2>References</h2>
{{ cave.references|wiki_to_html }}
{% endif %}
{% if cave.survey %}
<h2>Survey</h2>
{{ cave.survey|wiki_to_html }}
{% endif %}
{% if cave.kataster_status %}
<h2>Kataster_status</h2>
{{ cave.kataster_status|wiki_to_html }}
{% endif %}
{% if cave.underground_centre_line %}
<h2>Underground Centre Line</h2>
{{ cave.underground_centre_line|wiki_to_html }}
{% endif %}
{% if cave.survex_file %}
<h2>Survex File</h2>
{{ cave.survex_file|wiki_to_html }}
{% endif %}
{% if cave.notes %}
<h2>Notes</h2>
{{ cave.notes|wiki_to_html }}
{% endif %}
{% if cave.get_QMs %}
</p>
</div>
<div id="qms">
<p>{% if cave.get_QMs %}
<h2>Question marks</h2>
<h3>Extant</h3>
<ul id="cavelist">
@@ -85,5 +118,9 @@
{% endif %}
{% endfor %}
</ul>
{% endif %}
{% endif %}</p>
</div>
</div>
{% endblock %}