summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorexpo <expo@expobox.potato.hut>2012-08-06 12:19:48 +0200
committerexpo <expo@expobox.potato.hut>2012-08-06 12:19:48 +0200
commit1ef274ec1dca0c54ea3dbda6887960e8f665e2c9 (patch)
tree34b38e1cd1016393fe552d8f5e106d6c3ded95fd /templates
parent0f5627505f9249f520c6f43bba5864643dc8be0e (diff)
downloadtroggle-1ef274ec1dca0c54ea3dbda6887960e8f665e2c9.tar.gz
troggle-1ef274ec1dca0c54ea3dbda6887960e8f665e2c9.tar.bz2
troggle-1ef274ec1dca0c54ea3dbda6887960e8f665e2c9.zip
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
Diffstat (limited to 'templates')
-rw-r--r--templates/cave_entrances.html15
-rw-r--r--templates/dataformat/flatfile.html10
-rw-r--r--templates/editcave.html2
-rw-r--r--templates/editcave2.html2
-rw-r--r--templates/editentrance.html2
-rw-r--r--templates/editfile.html2
6 files changed, 14 insertions, 19 deletions
diff --git a/templates/cave_entrances.html b/templates/cave_entrances.html
index e4e939d..1364acf 100644
--- a/templates/cave_entrances.html
+++ b/templates/cave_entrances.html
@@ -51,11 +51,16 @@
{% if ent.entrance.bearings %}
<dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
{% endif %}
-
- {{ ent.entrance.tag_station|safe }}
- {{ ent.entrance.exact_station|safe }}
- {{ ent.entrance.other_station|safe }}
- {{ ent.entrance.other_description|safe }}
+ {% if ent.entrance.exact_station %}
+ <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }}</dd>
+ {% endif %}
+ {% if ent.entrance.other_station %}
+ <dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
+ {% if ent.entrance.other_description %}
+ - {{ ent.entrance.other_description|safe }}
+ {% endif %}
+ </dd>
+ {% endif %}
</dl>
</li>
{% endfor %}
diff --git a/templates/dataformat/flatfile.html b/templates/dataformat/flatfile.html
deleted file mode 100644
index 07d03ca..0000000
--- a/templates/dataformat/flatfile.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% autoescape off %}
-<html>
-<head>
-<title>{{ form.title }}</title>
-</head>
-<body>
-{{ form.html }}
-</body>
-</html>
-{% endautoescape %}
diff --git a/templates/editcave.html b/templates/editcave.html
index 0e1785b..d7bdf37 100644
--- a/templates/editcave.html
+++ b/templates/editcave.html
@@ -13,7 +13,7 @@
<form action="" method="post">{% csrf_token %}
{{ form }}
- <p><input type="submit" value="Sumbit" /></p>
+ <p><input type="submit" value="Submit" /></p>
</form>
{% endblock %}
diff --git a/templates/editcave2.html b/templates/editcave2.html
index e57b4cd..edac202 100644
--- a/templates/editcave2.html
+++ b/templates/editcave2.html
@@ -12,7 +12,7 @@
<form action="" method="post">{% csrf_token %}
<table>{{ form }}{{caveAndEntranceFormSet}}</table>
{{ versionControlForm }}
- <p><input type="submit" value="Sumbit" /></p>
+ <p><input type="submit" value="Submit" /></p>
</form>
{% endblock %}
diff --git a/templates/editentrance.html b/templates/editentrance.html
index d17d1f9..3b0e12b 100644
--- a/templates/editentrance.html
+++ b/templates/editentrance.html
@@ -12,7 +12,7 @@
<form action="" method="post">{% csrf_token %}
<table>{{ form }}</table>
{{ versionControlForm }}
- <p><input type="submit" value="Sumbit" /></p>
+ <p><input type="submit" value="Submit" /></p>
</form>
{% endblock %}
diff --git a/templates/editfile.html b/templates/editfile.html
index 954a1c4..b9ae115 100644
--- a/templates/editfile.html
+++ b/templates/editfile.html
@@ -90,7 +90,7 @@
<label for="id_date">Content:</label>
{{ fileForm.html }}
</div>
- <p><input type="submit" value="Sumbit Trip Report" /></p>
+ <p><input type="submit" value="Submit Trip Report" /></p>
</form>
{% endblock %}