diff options
| -rw-r--r-- | core/views/caves.py | 26 | ||||
| -rw-r--r-- | templates/_cave_uground_description.html | 36 | ||||
| -rw-r--r-- | templates/admin/base_site.html | 3 | ||||
| -rw-r--r-- | templates/errors/debug.html | 50 | ||||
| -rw-r--r-- | templates/widgets/HTMLarea.html | 5 |
5 files changed, 22 insertions, 98 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index 7706315..2bb2794 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -444,17 +444,21 @@ def ent(request, cave_id, ent_letter): 'entrance': cave_and_ent.entrance, 'letter': cave_and_ent.entrance_letter,}) -def entranceSlug(request, slug): - entrance = Entrance.objects.get(entranceslug__slug = slug) - if entrance.non_public and not request.user.is_authenticated: - return render(request,'nonpublic.html', {'instance': entrance}) - else: - return render(request,'entranceslug.html', {'entrance': entrance}) - -def surveyindex(request): - surveys=Survey.objects.all() - expeditions=Expedition.objects.order_by("-year") - return render(request,'survey.html',locals()) +# def entranceSlug(request, slug): + # '''This seems to be a fossil, but I am not sure... + # ''' + # entrance = Entrance.objects.get(entranceslug__slug = slug) + # if entrance.non_public and not request.user.is_authenticated: + # return render(request,'nonpublic.html', {'instance': entrance}) + # else: + # return render(request,'entranceslug.html', {'entrance': entrance}) + +# def surveyindex(request): + # '''The template does not exist, there is no URL which calls this, so it is a fossil + # ''' + # surveys=Survey.objects.all() + # expeditions=Expedition.objects.order_by("-year") + # return render(request,'survey.html',locals()) def get_entrances(request, caveslug): try: diff --git a/templates/_cave_uground_description.html b/templates/_cave_uground_description.html deleted file mode 100644 index 86a5e7e..0000000 --- a/templates/_cave_uground_description.html +++ /dev/null @@ -1,36 +0,0 @@ -<p>{% if cave.explorers %} - <h2>Explorers</h2> - {{ cave.explorers|safe }} -{% endif %} -{% if cave.underground_description %} - <h2>Underground Description</h2> - {{ cave.underground_description|safe }} -{% endif %} -{% if cave.equipment %} - <h2>Equipment</h2> - {{ cave.equipment|safe }} -{% endif %} -{% if cave.references %} - <h2>References</h2> - {{ cave.references|safe }} -{% endif %} -{% if cave.survey %} - <h2>Survey</h2> - {{ cave.survey|safe }} -{% endif %} -{% if cave.kataster_status %} - <h2>Kataster_status</h2> - {{ cave.kataster_status|safe }} -{% endif %} -{% if cave.underground_centre_line %} - <h2>Underground Centre Line</h2> - {{ cave.underground_centre_line|safe }} -{% endif %} -{% if cave.survex_file %} - <h2>Survex File</h2> - {{ cave.survex_file|safe }} -{% endif %} -{% if cave.notes %} - <h2>Notes</h2> - {{ cave.notes|safe }} -{% endif %}</p> diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index 83c59a2..8afd2c9 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -1,10 +1,11 @@ {% extends "admin/base.html" %} {% load i18n %} +<!-- This overrides a Django-built-in template. Do not delete. --> {% block title %}{{ title }} | {% trans 'Troggle site admin' %}{% endblock %} {% block branding %} -<h1 id="site-name">{% trans 'Troggle administration' %}</h1> +<h1 id="site-name">{% trans 'Troggle database administration' %}</h1> {% endblock %} {% block nav-global %}{% endblock %} diff --git a/templates/errors/debug.html b/templates/errors/debug.html deleted file mode 100644 index c2cc025..0000000 --- a/templates/errors/debug.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}Troggle Debug - Generic page{% endblock %} -{% block content %} - -<div class='middle'> - <h2>Troggle Debug Page</h2> -</div> - - -<div class='middle3 login'> - <div class='space'></div> - <div class='align-center'> - <h3>This is temporary debugging output. There has NOT been an error.</h3> - <h4> - - <font color="red"> - {% if message %} - <pre> - {{message}} - </pre> - {% else %} - <p>Placeholder. </p> - - {% endif %} - </font> - </h4> - <div class='space'><p> </div> - - <h3>What you should do now</h3> - <p>Please report this by emailing the nerds at - <a href="mailto:expo-tech@lists.wookware.org">expo-tech@lists.wookware.org</a> with this information: - <ol> - <li>The message written in <font color="red">red</font> above. - <li>The previous page URL: <font color="red"> -<script type="text/javascript"> - document.write(document.referrer); -</script></font> - <li>Go back to this previous page <script type="text/javascript"> - document.write("<a href='",document.referrer,"'>",document.referrer,"</a>"); - </script> - and see if you can tell whether the page causing the debug output was in HTML text which had been written manually, or whether it appeared to be a programming intention. - </ol> - - - </div> -</div> -</div> - -{% endblock %}
\ No newline at end of file diff --git a/templates/widgets/HTMLarea.html b/templates/widgets/HTMLarea.html index 81696ef..9b28012 100644 --- a/templates/widgets/HTMLarea.html +++ b/templates/widgets/HTMLarea.html @@ -1,5 +1,10 @@ <div class="HTMLarea"> {% include "django/forms/widgets/textarea.html" %} +<!-- this overrides django/forms/widgets/textarea.html +This is used by the HTML editor stuff that Martin wrote + +--> + {% if preview %} <iframe class="HTMLpreview"></iframe> {% endif %} |