From af65239d6e06e13a3ae576a064cf357e568c9dbc Mon Sep 17 00:00:00 2001
From: julian <devnull@localhost>
Date: Sat, 24 Jan 2009 19:49:51 +0100
Subject: [PATCH] [svn r8226] I initial work at adding caveareas. (Descirprion
of parts of caves)
---
troggle/expo/models.py | 8 ++++++++
troggle/expo/views_caves.py | 5 +++++
troggle/templates/base.html | 6 ++++--
troggle/templates/cave.html | 26 +-------------------------
troggle/templates/cavearea.html | 9 +++++++++
troggle/templates/cavebase.html | 28 ++++++++++++++++++++++++++++
troggle/urls.py | 1 +
7 files changed, 56 insertions(+), 27 deletions(-)
create mode 100644 troggle/templates/cavearea.html
create mode 100644 troggle/templates/cavebase.html
diff --git a/troggle/expo/models.py b/troggle/expo/models.py
index 50140aadf..058fff5ef 100644
--- a/troggle/expo/models.py
+++ b/troggle/expo/models.py
@@ -362,6 +362,14 @@ class Entrance(models.Model):
for f in self.FINDABLE_CHOICES:
if f[0] == self.findability:
return f[1]
+
+class CaveArea(models.Model):
+ description = models.TextField()
+ name = models.CharField(max_length=200, unique = True)
+ cave = models.ForeignKey('Cave')
+ parentArea = models.ForeignKey('CaveArea')
+ survexFile = models.CharField(max_length=200)
+
class QM(models.Model):
#based on qm.csv in trunk/expoweb/smkridge/204 which has the fields:
diff --git a/troggle/expo/views_caves.py b/troggle/expo/views_caves.py
index 4e691e5ac..691dd43d1 100644
--- a/troggle/expo/views_caves.py
+++ b/troggle/expo/views_caves.py
@@ -27,6 +27,11 @@ def survexblock(request, survexpath):
ftext = survexblock.text
return render_to_response('survexblock.html', {'survexblock':survexblock, 'ftext':ftext, 'settings':settings })
+def caveArea(request, name):
+ cavearea = models.CaveArea.objects.get(name = name)
+ cave = cavearea.cave
+ return render_to_response('cavearea.html', {'cavearea': cavearea, 'cave': cave, 'settings':settings })
+
def caveSearch(request):
query_string = ''
found_entries = None
diff --git a/troggle/templates/base.html b/troggle/templates/base.html
index 5357af1cc..b1fc47f33 100644
--- a/troggle/templates/base.html
+++ b/troggle/templates/base.html
@@ -34,8 +34,10 @@
-<div id="content" >
-{% block content %}
+<div id="content" >
+{% block contentheader %}
+{% endblock %}
+{% block content %}
REPLACE : The content
{% endblock %}
<br class="clearfloat" /> <!--This is to ensure that the content div expands around floated objects*/-->
diff --git a/troggle/templates/cave.html b/troggle/templates/cave.html
index e76c3b87f..24c010127 100644
--- a/troggle/templates/cave.html
+++ b/troggle/templates/cave.html
@@ -1,31 +1,7 @@
-{% extends "base.html" %}
+{% extends "cavebase.html" %}
{% load wiki_markup %}
-{% block title %}{{ cave.official_name|wiki_to_html }}{% endblock %}
-
{% block content %}
-<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>
-
{% if cave.entrances %}
<h2>Entrances</h2>
{% for ent in cave.entrances %}
diff --git a/troggle/templates/cavearea.html b/troggle/templates/cavearea.html
new file mode 100644
index 000000000..9049225f1
--- /dev/null
+++ b/troggle/templates/cavearea.html
@@ -0,0 +1,9 @@
+{% extends "cavebase.html" %}
+{% load wiki_markup %}
+
+{% block content %}
+{{ cavearea.description }}
+{{ cavearea.name }}
+{{ cavearea.parentArea }}
+{{ cavearea.survexFile }}
+{% endblock %}
\ No newline at end of file
diff --git a/troggle/templates/cavebase.html b/troggle/templates/cavebase.html
new file mode 100644
index 000000000..f546ebfe8
--- /dev/null
+++ b/troggle/templates/cavebase.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% load wiki_markup %}
+
+{% block title %}{{ cave.official_name|wiki_to_html }}{% 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
diff --git a/troggle/urls.py b/troggle/urls.py
index 1f10ecbcd..251fb73c2 100644
--- a/troggle/urls.py
+++ b/troggle/urls.py
@@ -14,6 +14,7 @@ urlpatterns = patterns('',
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch', caveSearch),
+ url(r'^cavearea', caveArea, name="caveArea"),
url(r'^survex/(.*?)\.index$', index, name="survexindex"),
(r'^survex/(?P<survex_file>.*)\.svx$', svx),