From d3e1650e3a3b82267bb1eb11b23c0f4d6ae0b1a3 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Tue, 4 Dec 2012 16:52:26 -0500 Subject: Enable admin site --- codemash/settings.py | 6 ++---- codemash/urls.py | 15 +++++++-------- templates/base.html | 14 ++++++++++++++ 3 files changed, 23 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 = ( 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', + 'django.contrib.admin', + 'django.contrib.admindocs', 'contact', '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 @@ from django.conf.urls import patterns, include, url +from django.contrib import admin + + +admin.autodiscover() -# Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() urlpatterns = patterns('', (r'^contact/', include('contact.urls', namespace='contact')), (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), (r'^accounts/', include('accounts.urls', namespace='account')), - url(r'^$', 'pages.views.home', name='home'), + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/', include(admin.site.urls)), - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^$', 'pages.views.home', name='home'), - # Uncomment the next line to enable the admin: - # url(r'^admin/', include(admin.site.urls)), ) diff --git a/templates/base.html b/templates/base.html index 136c66d..a394d69 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,6 +7,20 @@ + {% block content %} {% endblock %} -- cgit v1.2.3