diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | core/views/other.py | 17 | ||||
| -rw-r--r-- | templates/cave.html | 2 |
3 files changed, 10 insertions, 11 deletions
@@ -133,3 +133,5 @@ _1623-and-1626-no-schoenberg-hs.svx localsettings-oldMuscogee.py troggle.sqlite-journal - Shortcut.lnk troggle.sqlite - Shortcut.lnk +q.txt +t.txt diff --git a/core/views/other.py b/core/views/other.py index 167e0b2..0f3a414 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -22,8 +22,6 @@ from .auth import login_required_if_public '''Utility functions and code to serve the control panel and individual user's progress and task list (deprecated as we do not have individual user login). - -Also has code to download a logbook in a choice of formats (why?!) ''' todo = ''' @@ -31,13 +29,13 @@ todo = ''' - Use logbookdownloader to convert all older logbooks into the 2005-variant of HTML then we can get rid of the parsers for older formats. When we have done all the old logbooks, delete this function and the two templates. - - + + OR invent a new format, e.g. using <article> and <section>?, which is better! ''' def todos(request, module): '''produces todo text from module - We should automate this to find all those strings automatically + We could automate this to find all those strings automatically ''' from troggle.core.TESTS.tests import todo as tests from troggle.core.views.logbooks import todo as viewlogbooks @@ -72,7 +70,7 @@ def troggle404(request): # cannot get this to work. Handler404 in urls.py not ri ''' context = RequestContext(request) #context['caves'] = Cave.objects.all() - return render(request, ('404.html', context.flatten())) + return render(request, ('errors/generic.html', context.flatten())) def frontpage(request): '''never seen in common practice. Logon should redirect here when this is more useful''' @@ -91,10 +89,9 @@ def frontpage(request): @login_required_if_public def controlpanel(request): - '''This should be re-written to use ajax so that the user can see the progress - of the actions. - - Also need to add reinit_db option + '''Admin requires expoadmin user logged on + Mostly disabled apart from logbook export + DANGEROUS, these import functions kill the ground under your feet ! ''' jobs_completed=[] diff --git a/templates/cave.html b/templates/cave.html index 7cbeef2..e12bdc8 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -517,7 +517,7 @@ div#scene { {% if cave.survex_file %} <h2>Survex File</h2> - <p><a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021). See <a href="/handbook/computing/todo.html">/handbook/computing/todo.html</a>.<br> + <p><a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021). See <a href="/handbook/computing/todo.rst">/handbook/computing/todo.rst</a>.<br> <a href="{% if cave.kataster_number %}{% url "cave3d" cave.kataster_number %} {% else %}{% url "cave3d" cave.unofficial_number %} {% endif %}">3d file download</a> for this cave<br> <a href="{% if cave.kataster_number %}{% url "survexcavessingle" cave.kataster_number %}{% else %}{% url "survexcavessingle" cave.unofficial_number %}{% endif %}">survex file</a> for this cave |