diff --git a/blog/urls.py b/blog/urls.py index 525eb72..89bbbd9 100644 --- a/blog/urls.py +++ b/blog/urls.py @@ -1,9 +1,8 @@ from django.conf.urls import patterns, url from . import views, feed -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^feed/$', feed.LatestPosts(), name="feed"), url(r'^$', views.BlogIndex.as_view(), name="index"), url(r'^entry/(?P\S+)$', views.BlogDetail.as_view(), name="entry_detail"), -) +] diff --git a/qblog/settings.py b/qblog/settings.py index 8b6228a..edd918c 100644 --- a/qblog/settings.py +++ b/qblog/settings.py @@ -22,8 +22,6 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = True - ALLOWED_HOSTS = [] @@ -53,6 +51,23 @@ ROOT_URLCONF = 'qblog.urls' +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, "templates"),], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + 'django.template.context_processors.request', + ], + }, + }, +] + WSGI_APPLICATION = 'qblog.wsgi.application' @@ -84,5 +99,4 @@ # https://docs.djangoproject.com/en/dev/howto/static-files/ STATIC_URL = '/static/' -TEMPLATE_DIRS = (os.path.join(BASE_DIR, "templates"), ) STATICFILES_DIRS = (os.path.join(BASE_DIR, "static"), ) diff --git a/qblog/urls.py b/qblog/urls.py index a8b0436..db7820f 100644 --- a/qblog/urls.py +++ b/qblog/urls.py @@ -1,9 +1,8 @@ from django.conf.urls import patterns, include, url from django.contrib import admin -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^admin/', include(admin.site.urls)), url(r'^markdown/', include("django_markdown.urls")), url(r'^', include('blog.urls')), -) +]