aboutsummaryrefslogtreecommitdiff
path: root/codemash
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2012-12-04 16:52:26 -0500
committerMike Crute <mcrute@gmail.com>2012-12-26 20:52:30 -0500
commitd3e1650e3a3b82267bb1eb11b23c0f4d6ae0b1a3 (patch)
tree9b52200336316027b7a2ce7da5f1a870226928e4 /codemash
parentce3b9091f080c2a33a60d23af99de3222e570024 (diff)
downloaddjango-precompiler-d3e1650e3a3b82267bb1eb11b23c0f4d6ae0b1a3.tar.bz2
django-precompiler-d3e1650e3a3b82267bb1eb11b23c0f4d6ae0b1a3.tar.xz
django-precompiler-d3e1650e3a3b82267bb1eb11b23c0f4d6ae0b1a3.zip
Enable admin site
Diffstat (limited to 'codemash')
-rw-r--r--codemash/settings.py6
-rw-r--r--codemash/urls.py15
2 files changed, 9 insertions, 12 deletions
diff --git a/codemash/settings.py b/codemash/settings.py
index 0285da9..2d2895b 100644
--- a/codemash/settings.py
+++ b/codemash/settings.py
@@ -122,10 +122,8 @@ INSTALLED_APPS = (
122 'django.contrib.sites', 122 'django.contrib.sites',
123 'django.contrib.messages', 123 'django.contrib.messages',
124 'django.contrib.staticfiles', 124 'django.contrib.staticfiles',
125 # Uncomment the next line to enable the admin: 125 'django.contrib.admin',
126 # 'django.contrib.admin', 126 'django.contrib.admindocs',
127 # Uncomment the next line to enable admin documentation:
128 # 'django.contrib.admindocs',
129 127
130 'contact', 128 'contact',
131 'accounts', 129 'accounts',
diff --git a/codemash/urls.py b/codemash/urls.py
index 567499c..68896ca 100644
--- a/codemash/urls.py
+++ b/codemash/urls.py
@@ -1,19 +1,18 @@
1from django.conf.urls import patterns, include, url 1from django.conf.urls import patterns, include, url
2from django.contrib import admin
3
4
5admin.autodiscover()
2 6
3# Uncomment the next two lines to enable the admin:
4# from django.contrib import admin
5# admin.autodiscover()
6 7
7urlpatterns = patterns('', 8urlpatterns = patterns('',
8 (r'^contact/', include('contact.urls', namespace='contact')), 9 (r'^contact/', include('contact.urls', namespace='contact')),
9 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), 10 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')),
10 (r'^accounts/', include('accounts.urls', namespace='account')), 11 (r'^accounts/', include('accounts.urls', namespace='account')),
11 12
12 url(r'^$', 'pages.views.home', name='home'), 13 url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
14 url(r'^admin/', include(admin.site.urls)),
13 15
14 # Uncomment the admin/doc line below to enable admin documentation: 16 url(r'^$', 'pages.views.home', name='home'),
15 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
16 17
17 # Uncomment the next line to enable the admin:
18 # url(r'^admin/', include(admin.site.urls)),
19) 18)