rest of martin's changes, without reverting lineend issues

1 files changed, 18 insertions, 18 deletions

diff --git a/templates/cave_description.html b/templates/cave_description.html
index 572de78..7105963 100644
--- a/templates/cave_description.html
+++ b/templates/cave_description.html
@@ -1,19 +1,19 @@
-{% extends "cavebase.html" %}

-{% load wiki_markup %}

-{% block title %} {{cave_description}} {% endblock title %}

-{% block editLink %}<a href={{cave_description.get_admin_url}}>Edit description {{cave_description}}</a>{% endblock %}

-

-{% block contentheader %}

-	{{cave_description.long_name}}

-{% endblock contentheader %}

-

-

-

-{% block content %}

-

-<h1>{{cave_description.long_name}}</h1>

-<p>

-	{{cave_description.description|wiki_to_html}}

-</p>

-

+{% extends "cavebase.html" %}
+{% load wiki_markup %}
+{% block title %} {{cave_description}} {% endblock title %}
+{% block editLink %}<a href={{cave_description.get_admin_url}}>Edit description {{cave_description}}</a>{% endblock %}
+
+{% block contentheader %}
+	{{cave_description.long_name}}
+{% endblock contentheader %}
+
+
+
+{% block content %}
+
+<h1>{{cave_description.long_name}}</h1>
+<p>
+	{{cave_description.description|wiki_to_html}}
+</p>
+
 {% endblock content %}
\ No newline at end of file