Unverified Commit 21bf5e3f authored by David Haynes's avatar David Haynes
Browse files

refactor: Prepare other urls.py for 1.10

- Also update django template import to point to the correct location
parent 8b4a1f34
......@@ -165,13 +165,13 @@ TEMPLATES = [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
'django.template.context_processors.request',
],
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
'loaders': [
......
from django.conf.urls import patterns, include, url
from django.contrib.sites.models import Site
# Uncomment the next two lines to enable the admin:
# Django Imports
from django.conf.urls import include, url
from django.contrib import admin
import django.contrib.auth.views
admin.autodiscover()
urlpatterns = patterns('',
# Examples:
# Uncomment the admin/doc line below to enable admin documentation:
urlpatterns = [
# / - The homepage
url(r'^', include('website.urls')),
#url(r'management/', include('management.urls')),
# /admin - The admin panels
url(r'^admin/', include(admin.site.urls)),
# /admin/docs - Documentation for admin
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# /api-auth - API Auth page
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^admin/', include(admin.site.urls)),
url(r'^logout/$', 'django.contrib.auth.views.logout', {
'next_page': '/'}),
)
# /logout - Redirect to the homepage on logout
url(r'^logout/$', django.contrib.auth.views.logout, {'next_page': '/'}),
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment