re-ordering middleware and logon system

1 files changed, 7 insertions, 2 deletions

diff --git a/urls.py b/urls.py
index 4968ad8..2c61054 100644
--- a/urls.py
+++ b/urls.py
@@ -44,14 +44,19 @@ else:
 actualurlpatterns = [
     url(r'^expofiles/', include(expofilesurls)), 
     
-    url(r'^troggle$',    views_other.frontpage,      name="frontpage"),
+    url(r'^troggle$',    views_other.frontpage,      name="frontpage"), # control panel. Shows recent actions.
     url(r'^caves$',      views_caves.caveindex,      name="caveindex"),
     url(r'^indxal.htm$', views_caves.caveindex,      name="caveindex"), # ~420 hrefs to this url in expoweb files
     url(r'^people/?$',   views_logbooks.personindex, name="personindex"),
 
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
     url(r'^admin/', admin.site.urls),
-    url(r'^accounts/', include('registration.backends.default.urls')), #LOGIN_URL = '/accounts/login/' # default
+    
+    # setting LOGIN_URL = '/accounts/login/' is default
+    #url(r'^accounts/', include('registration.backends.default.urls')), # deprecated, replace with .model_activation.urls
+    url(r'^accounts/', include('registration.backends.model_activation.urls')),  # deprecated in Dj3.0, but must not be commented out.
+    url(r'^accounts/', include('django.contrib.auth.urls')),  # from Dj3.0, see site-packages\registration\auth_urls_classes.py
+    
 
     url(r'^newqmnumber/?$',              views_other.ajax_QM_number, ),
 #   url(r'^lbo_suggestions/?$',              logbook_entry_suggestions),   #broken, removed.