From b4abd7b6bcecf31dbcb29f87cb436e7282104bea Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Tue, 4 May 2021 15:44:46 +0100
Subject: [PATCH] menu update

---
 templates/404.html  | 20 --------------------
 templates/base.html |  4 ++--
 urls.py             |  2 --
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 templates/404.html

diff --git a/templates/404.html b/templates/404.html
deleted file mode 100644
index 2e35ee5..0000000
--- a/templates/404.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% block title %}List of survex files{% endblock %}
-
-{% block content %}
-
-<h1>404 - Page not found </h1>
-
-<h3>Kataster number not found :{{cave}}</h3>
-<p>More helpful information will appear here when someone programs it.</p>
-<p>
-Custom 404 page template/404.html is only activated when DEBUG=False in Django settings.
-So this is of very limited usefulness to us as we do not do that with troggle, even in production.
-Instead we do not raise the http404 exception in our code, we call our own error-handling display page.
-We have not yet done this with all our code though..
-<p>
-
-
-<p><em>This page created 25 March 2021</em></p>
-{% endblock %}
-
diff --git a/templates/base.html b/templates/base.html
index f386027..3e73bb5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,6 +18,7 @@
     <a href="/">Home</a> |
     <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
     <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |
+    <a id="handbook" href="/handbook/computing/onlinesystems.html">Handbook</a> |
     {% if user.username %}User:{{ user.username }}
     {% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>){% endif %}
     | <a <a href='/accounts/logout/'>Log out</a> {% else %} <a href='/accounts/login/'>Log in</a> {% endif %}
@@ -32,13 +33,12 @@
     <a href="{% url "allwallets" %}">Scans</a> |
     <a href="{% url "scanupload"  '2021:01' %}">Upload Scans</a> |
     <a href="{% url "dwgallfiles" %}">Drawings</a> |
+    <a href="{% url "dwgupload" %}">Upload Drawings</a> |
     <a href="/1623/290/290.html">290 (FGH)</a> |
-    <a href="/1623/291/291">291 (GSH)</a> |
     <a href="/1623/204/204.html">204 (Steinbr&uuml;cken)</a> |
     <br>
     
     <a href="{% url "dataissues" %}">Data Issues</a> |
-    <a href="/handbook/computing/onlinesystems.html">handbook</a> |
     <a href="/handbook/computing/todo-data.html">tasks to do </a>  |
     <a id="cavesLink" href="{% url "caveindex" %}">caves</a>  |
     <a id="folklink" href="/folk">expoers</a>  |
diff --git a/urls.py b/urls.py
index f3092a8..7df80dd 100644
--- a/urls.py
+++ b/urls.py
@@ -42,8 +42,6 @@ The API urls return TSV or JSON and are new in July 2020.
 todo = '''Replace most re_path() with modern and simpler path()
 '''
 
-#handler404 = 'troggle.core.views.other.troggle404' # can't get this to work. but 404.html is default anyway
-
 # Many of these patterns do not work because troggle spent many years broken and we have
 # not yet restored all the functions. Some may have never been fully implemented in
 # the first place and what they were intended to provide is obscure.