tidy up

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=[]