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

author: Martin Green <martin.speleo@gmail.com> 2011-07-11 00:15:59 +0100
committer: Martin Green <martin.speleo@gmail.com> 2011-07-11 00:15:59 +0100
commit: 65c55f0f21fe85a678d48842da10e0ea5c917ae5 (patch)
tree: 0f465b9415901f9eedd0fc5e1e87837ce6bb70a4 /templates
parent: 8578a3097a44ffd277f65127b865160ab79ad317 (diff)
download: troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.tar.gz
troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.tar.bz2
troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.zip
7 files changed, 177 insertions, 69 deletions
diff --git a/templates/base.html b/templates/base.html
index 6a4da29..d3341b2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
 <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
 <link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
 <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
diff --git a/templates/cave.html b/templates/cave.html
index 9469118..12e83b4 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -1,72 +1,105 @@
 {% extends "cavebase.html" %}
-{% load wiki_markup %}
-{% block editLink %}| <a href={{cave.get_admin_url}}>Edit cave {{cave|wiki_to_html_short}}</a>{% endblock %}
 
-{% block related %}
-  <h2>All logbook entries regarding this cave ({{cave.logbookentry_set.count}})</h2>
-  <table>
-  {% for logbookentry in cave.logbookentry_set.all %}
-  {% if logbookentry.title %}
-    <tr>
-      <td>{{logbookentry.date}}</td>
-      <td><a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</a></td>
-    </tr>
-  {% endif %}
-  {% endfor %}
-  </table>
-{% 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 %}
+{% endblock %}{% endblock %}
 
-{% if cave.entrances %}
+<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|wiki_to_html_short }}">{{ ent.entrance_letter|wiki_to_html_short }}</a>
+        <a href = "./{{ ent.entrance_letter|safe }}">{{ ent.entrance_letter|safe }}</a>
         {% if ent.entrance.marking %}
-            Marking: {{ ent.entrance.marking_val|wiki_to_html_short }}
+            Marking: {{ ent.entrance.marking_val|safe }}
         {% endif %}
         <br>
     {% endfor %}
-{% endif %}
-
-{% if cave.explorers %}
+{% endif %}</p>
+	</div>
+	<div id="cave">
+		<p>{% if cave.explorers %}
     <h2>Explorers</h2>
-    {{ cave.explorers|wiki_to_html }}
+    {{ cave.explorers|safe }}
 {% endif %}
 {% if cave.underground_description %}
     <h2>Underground Description</h2>
-    {{ cave.underground_description|wiki_to_html }}
+    {{ cave.underground_description|safe }}
 {% endif %}
 {% if cave.equipment %}
     <h2>Equipment</h2>
-    {{ cave.equipment|wiki_to_html }}
+    {{ cave.equipment|safe }}
 {% endif %}
 {% if cave.references %}
     <h2>References</h2>
-    {{ cave.references|wiki_to_html }}
+    {{ cave.references|safe }}
 {% endif %}
 {% if cave.survey %}
     <h2>Survey</h2>
-    {{ cave.survey|wiki_to_html }}
+    {{ cave.survey|safe }}
 {% endif %}
 {% if cave.kataster_status %}
     <h2>Kataster_status</h2>
-    {{ cave.kataster_status|wiki_to_html }}
+    {{ cave.kataster_status|safe }}
 {% endif %}
 {% if cave.underground_centre_line %}
     <h2>Underground Centre Line</h2>
-    {{ cave.underground_centre_line|wiki_to_html }}
+    {{ cave.underground_centre_line|safe }}
 {% endif %}
 {% if cave.survex_file %}
     <h2>Survex File</h2>
-    {{ cave.survex_file|wiki_to_html }}
+    {{ cave.survex_file|safe }}
 {% endif %}
 {% if cave.notes %}
     <h2>Notes</h2>
-    {{ cave.notes|wiki_to_html }}
-{% endif %}
-
-{% if cave.get_QMs %}
+    {{ cave.notes|safe }}
+{% endif %}</p>
+	</div>
+	<div id="logbook">
+		<p>  
+<table>
+  {% for logbookentry in cave.logbookentry_set.all %}
+  {% if logbookentry.title %}
+    <tr>
+      <td>{{logbookentry.date}}</td>
+      <td><a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</a></td>
+    </tr>
+  {% endif %}
+  {% endfor %}
+  </table>
+</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 %}
diff --git a/templates/cavebase.html b/templates/cavebase.html
index 8e8132e..6e27111 100644
--- a/templates/cavebase.html
+++ b/templates/cavebase.html
@@ -1,28 +1,26 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
+<html>
+<head>
 
-{% block title %}{{ cave.official_name|wiki_to_html_short }}{% endblock %}
-
-{% block contentheader %}
-<table id="cavepage">
-<tr>
-    <th id="kat_no">
-        {% if cave.kataster_number %}
-            {{ cave.kataster_number|wiki_to_html_short }}
-            {% if cave.entrancelist %}
-                - {{ cave.entrancelist|wiki_to_html_short }}
-            {% endif %}
-            {% if cave.unofficial_number %}
-                <br />({{ cave.unofficial_number|wiki_to_html_short }})
-            {% endif %}
-        {% endif %}
-    </th>
-    <th id="name">
-         {{ cave.official_name|wiki_to_html_short }}
-    </th>
-    <th id="status">
-         {{ cave.kataster_code|wiki_to_html_short }}
-    </th>
-</tr>
-</table>
-{% endblock %}
-\ No newline at end of file
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>{% block title %}{{ cave.official_name|safe }}{% endblock %}
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/redmond/jquery-ui-1.8.14.custom.css" />
+<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
+<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.14.custom.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+	$(function() {
+		$( "#tabs" ).tabs();
+	});
+</script>
+</head>
+<body>
+{% block content %}{% endblock %}
+{% block menu %}
+<ul id="links">
+<li>Back to <a href="/index.htm">Expedition home page</a></li>
+<li>Back to <a href="http://cucc.survex.com/">CUCC home page</a></li>
+</ul>
+{% endblock %}
+</body>
+</html>
diff --git a/templates/caveindex.html b/templates/caveindex.html
index ae8b224..ac67559 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -1,23 +1,37 @@
-{% extends "base.html" %}
+{% extends "cavebase.html" %}
 {% load wiki_markup %}
 
 {% block title %}Cave Index{% endblock %}
 
 {% block content %}
 
+<h1>Cave Index</h1>
+
 <h3>Notable caves</h3>
 <ul>
 {% for cave in notablecaves %}
-  <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave}})</a> </li>
+  <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
+{% endfor %}
+</ul>
+
+<h3>1623</h3>
+
+<ul class="searchable">
+{% for cave in caves1623 %}
+
+  <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
+
 {% endfor %}
 </ul>
 
-<h3>All caves</h3>
+<h3>1626</h3>
 
 <ul class="searchable">
-{% for cave in caves %}
-  <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave}})</a> </li>
+{% for cave in caves1626 %}
+
+  <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
+
 {% endfor %}
 </ul>
 
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/templates/editcave.html b/templates/editcave.html
new file mode 100644
index 0000000..0e1785b
--- /dev/null
+++ b/templates/editcave.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% load csrffaker %} 
+{% block title %}Logbook {{logbookentry.id}}{% endblock %}
+{% block head %}
+
+<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" />
+<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script>
+<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
+<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+{{ tripForm.media }}
+{% endblock %}
+{% block content %}
+
+<form action="" method="post">{% csrf_token %}
+    {{ form }}
+    <p><input type="submit" value="Sumbit" /></p>
+</form>
+
+{% endblock %}
diff --git a/templates/expowebbase.html b/templates/expowebbase.html
new file mode 100644
index 0000000..128ce54
--- /dev/null
+++ b/templates/expowebbase.html
@@ -0,0 +1,40 @@
+<html>
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>{% block title %}{% endblock %}
+</title>
+<link rel="stylesheet" type="text/css" href="../css/main2.css" />
+
+</head>
+<body>
+<div id="mainmenu">
+<ul>
+<li><a href="/index.htm">Expo web home</a></li>
+<li><a href="/intro.html">Introduction</a></li>
+<li><a href="/infodx.htm">Main index</a></li>
+<li><a href="/indxal.htm">Cave index</a></li>
+{% if cavepage %}
+<ul>
+<li><a href="{% url survexcaveslist %}">All Survex</a></li>
+<li><a href="{% url surveyscansfolders %}">Scans</a></li>
+<li><a href="{% url tunneldata %}">Tunneldata</a></li>
+<li><a href="{% url survexcavessingle 161 %}">161</a></li>
+<li><a href="{% url survexcavessingle 204 %}">204</a></li>
+<li><a href="{% url survexcavessingle 258 %}">258</a></li>
+<li><a href="{% url expedition 2009 %}">Expo2009</a></li>
+<li><a href="{% url expedition 2010 %}">Expo2010</a></li>
+<li><a href="{% url expedition 2011 %}">Expo2011</a></li>
+<li><a href="/admin">Django admin</a></li>
+</ul>
+{% endif %}
+<li><a href="/handbook/index.htm">Expedition handbook</a></li>
+<li><a href="/pubs.htm">Published reports</a></li>
+<li><a href="/areas.htm">Area description</a></li>
+<li><a href="/">CUCC website</a></li>
+</ul>
+</div>
+{% block content %}{% endblock %}
+</body>
+</html>
+
diff --git a/templates/flatpage.html b/templates/flatpage.html
index ef8c4ab..8c476b8 100644
--- a/templates/flatpage.html
+++ b/templates/flatpage.html
@@ -2,7 +2,7 @@
 <head>
 {{ head|safe }}
 </head>
-<body>
+<body{% if bodyid %} id="{{ bodyid }}"{% endif %}>
 {{ body|safe }}
 {% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %}
 </body>
author	Martin Green <martin.speleo@gmail.com>	2011-07-11 00:15:59 +0100
committer	Martin Green <martin.speleo@gmail.com>	2011-07-11 00:15:59 +0100
commit	65c55f0f21fe85a678d48842da10e0ea5c917ae5 (patch)
tree	0f465b9415901f9eedd0fc5e1e87837ce6bb70a4 /templates
parent	8578a3097a44ffd277f65127b865160ab79ad317 (diff)
download	troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.tar.gz troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.tar.bz2 troggle-65c55f0f21fe85a678d48842da10e0ea5c917ae5.zip