diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:45:26 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:45:26 +0100 |
| commit | efd47085261e73c08e8d5fe9eaadbc8f761fe7ac (patch) | |
| tree | 25301974c2bab519cdec78d47db4b4f0100b956f /templates | |
| parent | 98a3d44eed3286da2c0124253c89d83f16aa095b (diff) | |
| download | troggle-efd47085261e73c08e8d5fe9eaadbc8f761fe7ac.tar.gz troggle-efd47085261e73c08e8d5fe9eaadbc8f761fe7ac.tar.bz2 troggle-efd47085261e73c08e8d5fe9eaadbc8f761fe7ac.zip | |
[svn] I initial work at adding caveareas. (Descirprion of parts of caves)
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/cave.html | 26 | ||||
| -rw-r--r-- | templates/cavearea.html | 9 | ||||
| -rw-r--r-- | templates/cavebase.html | 28 |
4 files changed, 42 insertions, 27 deletions
diff --git a/templates/base.html b/templates/base.html index 5357af1..b1fc47f 100644 --- a/templates/base.html +++ b/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/templates/cave.html b/templates/cave.html index e76c3b8..24c0101 100644 --- a/templates/cave.html +++ b/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/templates/cavearea.html b/templates/cavearea.html new file mode 100644 index 0000000..9049225 --- /dev/null +++ b/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/templates/cavebase.html b/templates/cavebase.html new file mode 100644 index 0000000..f546ebf --- /dev/null +++ b/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 |