diff options
Diffstat (limited to 'codemash')
-rw-r--r-- | codemash/settings.py | 6 | ||||
-rw-r--r-- | codemash/urls.py | 15 |
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 @@ | |||
1 | from django.conf.urls import patterns, include, url | 1 | from django.conf.urls import patterns, include, url |
2 | from django.contrib import admin | ||
3 | |||
4 | |||
5 | admin.autodiscover() | ||
2 | 6 | ||
3 | # Uncomment the next two lines to enable the admin: | ||
4 | # from django.contrib import admin | ||
5 | # admin.autodiscover() | ||
6 | 7 | ||
7 | urlpatterns = patterns('', | 8 | urlpatterns = 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 | ) |