Add bootstrap and test. Py3.4 by default, move to django_cas_ng and fnpdeploy.

[fnp-django-template.git] / src / src / project_name / urls.py

diff --git a/src/src/project_name/urls.py b/src/src/project_name/urls.py
index c579b39..3303eb4 100644 (file)
--- a/src/src/project_name/urls.py
+++ b/src/src/project_name/urls.py
@@ -1,29 +1,21 @@
 from django.conf.urls import patterns, include, url
 from django.conf import settings
+from django.contrib import admin
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', '{{ project_name }}.views.home', name='home'),
     # url(r'^{{ project_name }}/', include('foo.urls')),
-)
-
 
-# Admin stuff, if necessary.
-if 'django.contrib.admin' in settings.INSTALLED_APPS:
-    from django.contrib import admin
-    admin.autodiscover()
 
-    urlpatterns += patterns('',
-        url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-        url(r'^admin/', include(admin.site.urls)),
-    )
+    # Admin stuff.
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/', include(admin.site.urls)),
 
-# Auth stuff, if necessary
-if 'django_cas' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-        (r'^accounts/login/$', 'django_cas.views.login'),
-        (r'^accounts/logout/$', 'django_cas.views.logout'),
-    )
+    # CAS stuff.
+    url(r'^accounts/login/$', 'django_cas_ng.views.login'),
+    url(r'^accounts/logout/$', 'django_cas_ng.views.logout'),
+)
 
 # Media in DEBUG mode
 if settings.DEBUG:
@@ -32,3 +24,4 @@ if settings.DEBUG:
             'document_root': settings.MEDIA_ROOT,
         }),
    )
+