From 27af84da65e2d0660f8afd75778906a94211566e Mon Sep 17 00:00:00 2001
From: Sam Wenham <sam@wenhams.co.uk>
Date: Sun, 10 Mar 2019 11:05:57 +0000
Subject: [PATCH] Remove the news section as it never gets updated Fix logbook
entry so the edit link works Tidy the control panel page
---
templates/controlPanel.html | 52 +++++++++++++++++++++++++------------
templates/frontpage.html | 11 --------
templates/logbookentry.html | 2 +-
3 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/templates/controlPanel.html b/templates/controlPanel.html
index 327af13..41c9409 100644
--- a/templates/controlPanel.html
+++ b/templates/controlPanel.html
@@ -23,25 +23,45 @@
<form name="reset" method="post" action="">
-<h3>Wipe:</h3>
-
-<table>
-<tr><td>Wipe entire database and recreate tables: </td><td><input type="checkbox" name="reload_db" /></td><td> <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility."></td></tr>
-</table>
+ <h3>Wipe:</h3>
+ <table>
+ <tr>
+ <td>Wipe entire database and recreate tables: </td>
+ <td><input type="checkbox" name="reload_db" /></td>
+ <td>
+ <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility.">
+ </td>
+ </tr>
+ </table>
</form>
<h3>Import (non-destructive):</h3>
<form name="import" method="post" action="">
-<table>
-<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_people"/></td></tr>
-<tr><td>caves from cavetab2.csv using parsers\cavetab.py</td><td> <input type="checkbox" class="parser" name="import_cavetab"/></td></tr>
-<tr><td>logbook entries using parsers\logbooks.py</td><td><input type="checkbox" name="import_logbooks"/></td></tr>
-<tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="import_QMs" /></td></tr>
-<tr><td>survey scans using parsers\surveys.py</td><td><input type="checkbox" name="import_surveys" /></td></tr>
-<tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="import_survex" /></td></tr>
-
-</table>
-
-
+ <table>
+ <tr>
+ <td>people from folk.csv using parsers\people.py</td>
+ <td><input type="checkbox" name="import_people"/></td>
+ </tr>
+ <tr>
+ <td>caves from cavetab2.csv using parsers\cavetab.py</td>
+ <td> <input type="checkbox" class="parser" name="import_cavetab"/></td>
+ </tr>
+ <tr>
+ <td>logbook entries using parsers\logbooks.py</td>
+ <td><input type="checkbox" name="import_logbooks"/></td>
+ </tr>
+ <tr>
+ <td>QMs using parsers\QMs.py</td>
+ <td><input type="checkbox" name="import_QMs" /></td>
+ </tr>
+ <tr>
+ <td>survey scans using parsers\surveys.py</td>
+ <td><input type="checkbox" name="import_surveys" /></td>
+ </tr>
+ <tr>
+ <td>survex data using parsers\survex.py</td>
+ <td><input type="checkbox" name="import_survex" /></td>
+ </tr>
+ </table>
<p>
<input type="submit" id="Import" value="Import">
diff --git a/templates/frontpage.html b/templates/frontpage.html
index f07722a..28206b6 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -49,17 +49,6 @@ Here you will find information about the {{expedition.objects.count}} expedition
If you are an expedition member, please sign up using the link to the top right and begin editing.
</p>
-<h3>News</h3>
-
-<p class="indent">
-Everyone is gearing up for the 2009 expedition; please see the link below for the main expedition website.
-</p>
-
-<h3>Troggle development</h3>
-<p class="indent">
-Troggle is still under development. Check out the <a href="http://troggle.googlecode.com">development page</a> on google code, where you can file bug reports, make suggestions, and help develop the code. There is also an old todo list at <a href="{%url "todo"%}">here</a>.
-</p>
-</div>
{% endblock content %}
{% block margins %}
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 93ce32b..2b60996 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -2,7 +2,7 @@
{% load wiki_markup %}
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
-{% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}
+{% block editLink %}<a href={{logbookentry.get_admin_url}}/>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}
{% block content %}
{% block related %}{% endblock %}