diff --git a/cbreader/settings.py b/cbreader/settings.py index 841813b..50e8501 100644 --- a/cbreader/settings.py +++ b/cbreader/settings.py @@ -37,23 +37,11 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'silk', 'snowpenguin.django.recaptcha2', 'comic', 'comic_auth', ) -# MIDDLEWARE_CLASSES = ( -# 'django.contrib.sessions.middleware.SessionMiddleware', -# 'django.middleware.common.CommonMiddleware', -# 'django.middleware.csrf.CsrfViewMiddleware', -# 'django.contrib.auth.middleware.AuthenticationMiddleware', -# 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', -# 'django.contrib.messages.middleware.MessageMiddleware', -# 'django.middleware.clickjacking.XFrameOptionsMiddleware', -# 'django.middleware.security.SecurityMiddleware', -# 'silk.middleware.SilkyMiddleware', -# ) MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -62,7 +50,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'silk.middleware.SilkyMiddleware', + # 'silk.middleware.SilkyMiddleware', ] ROOT_URLCONF = 'cbreader.urls' @@ -70,7 +58,7 @@ ROOT_URLCONF = 'cbreader.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'DIRS': ['templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/cbreader/urls.py b/cbreader/urls.py index 2ab4180..a150d95 100644 --- a/cbreader/urls.py +++ b/cbreader/urls.py @@ -14,6 +14,7 @@ Including another URLconf 2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) """ from django.conf.urls import include, url +from django.contrib import admin import comic.views import comic_auth.views @@ -24,6 +25,6 @@ urlpatterns = [ url(r'^logout/', comic_auth.views.comic_logout), url(r'^setup/', comic.views.initial_setup), url(r'^comic/', include('comic.urls')), - # url(r'^admin/', include(admin.site.urls)), - url(r'^silk/', include('silk.urls', namespace='silk')) + url(r'^admin/', admin.site.urls), + # url(r'^silk/', include('silk.urls', namespace='silk')) ]