xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

tidy up

Browse Source
This commit is contained in:
Philip Sargent 2022-12-29 13:56:46 +00:00
parent 9dc1853e10
commit de74cd4867
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -133,3 +133,5 @@ _1623-and-1626-no-schoenberg-hs.svx
localsettings-oldMuscogee.py localsettings-oldMuscogee.py
troggle.sqlite-journal - Shortcut.lnk troggle.sqlite-journal - Shortcut.lnk
troggle.sqlite - Shortcut.lnk troggle.sqlite - Shortcut.lnk
q.txt
t.txt

15
core/views/other.py
View File

@ -22,8 +22,6 @@ from .auth import login_required_if_public
'''Utility functions and code to serve the control panel and individual user's '''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). 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 = ''' todo = '''
@ -32,12 +30,12 @@ todo = '''
get rid of the parsers for older formats. get rid of the parsers for older formats.
When we have done all the old logbooks, delete this function and the two templates. 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): def todos(request, module):
'''produces todo text from 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.TESTS.tests import todo as tests
from troggle.core.views.logbooks import todo as viewlogbooks 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 = RequestContext(request)
#context['caves'] = Cave.objects.all() #context['caves'] = Cave.objects.all()
return render(request, ('404.html', context.flatten())) return render(request, ('errors/generic.html', context.flatten()))
def frontpage(request): def frontpage(request):
'''never seen in common practice. Logon should redirect here when this is more useful''' '''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 @login_required_if_public
def controlpanel(request): def controlpanel(request):
'''This should be re-written to use ajax so that the user can see the progress '''Admin requires expoadmin user logged on
of the actions. Mostly disabled apart from logbook export
DANGEROUS, these import functions kill the ground under your feet !
Also need to add reinit_db option
''' '''
jobs_completed=[] jobs_completed=[]

2
templates/cave.html
View File

@ -517,7 +517,7 @@ div#scene {
{% if cave.survex_file %} {% if cave.survex_file %}
<h2>Survex File</h2> <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>&nbsp;for this cave<br> <a href="{% if cave.kataster_number %}{% url "cave3d" cave.kataster_number %} {% else %}{% url "cave3d" cave.unofficial_number %} {% endif %}">3d file download</a>&nbsp;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> &nbsp;for this cave <a href="{% if cave.kataster_number %}{% url "survexcavessingle" cave.kataster_number %}{% else %}{% url "survexcavessingle" cave.unofficial_number %}{% endif %}">survex file</a> &nbsp;for this cave