From 1ab7528f7b27aabae52dff7727030929f3c3649d Mon Sep 17 00:00:00 2001
From: Philip Sargent
Date: Thu, 29 Dec 2022 15:07:58 +0000
Subject: [PATCH] Clean up unused templates. All checked.
---
core/views/caves.py | 24 +++++++-----
templates/_cave_uground_description.html | 36 -----------------
templates/admin/base_site.html | 3 +-
templates/errors/debug.html | 50 ------------------------
templates/widgets/HTMLarea.html | 5 +++
5 files changed, 21 insertions(+), 97 deletions(-)
delete mode 100644 templates/_cave_uground_description.html
delete mode 100644 templates/errors/debug.html
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 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):
- surveys=Survey.objects.all()
- expeditions=Expedition.objects.order_by("-year")
- return render(request,'survey.html',locals())
+# 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 @@
-{% if cave.explorers %}
-
Explorers
- {{ cave.explorers|safe }}
-{% endif %}
-{% if cave.underground_description %}
- Underground Description
- {{ cave.underground_description|safe }}
-{% endif %}
-{% if cave.equipment %}
- Equipment
- {{ cave.equipment|safe }}
-{% endif %}
-{% if cave.references %}
- References
- {{ cave.references|safe }}
-{% endif %}
-{% if cave.survey %}
- Survey
- {{ cave.survey|safe }}
-{% endif %}
-{% if cave.kataster_status %}
- Kataster_status
- {{ cave.kataster_status|safe }}
-{% endif %}
-{% if cave.underground_centre_line %}
- Underground Centre Line
- {{ cave.underground_centre_line|safe }}
-{% endif %}
-{% if cave.survex_file %}
- Survex File
- {{ cave.survex_file|safe }}
-{% endif %}
-{% if cave.notes %}
- Notes
- {{ cave.notes|safe }}
-{% endif %}
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 %}
+
{% block title %}{{ title }} | {% trans 'Troggle site admin' %}{% endblock %}
{% block branding %}
-{% trans 'Troggle administration' %}
+{% trans 'Troggle database administration' %}
{% 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 %}
-
-
-
Troggle Debug Page
-
-
-
-
-
-
-
This is temporary debugging output. There has NOT been an error.
-
-
-
- {% if message %}
-
- {{message}}
-
- {% else %}
- Placeholder.
-
- {% endif %}
-
-
-
-
-
What you should do now
-
Please report this by emailing the nerds at
- expo-tech@lists.wookware.org with this information:
-
- - The message written in red above.
-
- The previous page URL:
-
-
- Go back to this previous page
- 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.
-
-
-
-
-
-
-
-{% 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 @@
{% include "django/forms/widgets/textarea.html" %}
+
+
{% if preview %}
{% endif %}