Add flatpages for CMS

4 files changed, 11 insertions, 2 deletions

diff --git a/codemash/settings.py b/codemash/settings.py
index 2d2895b..fbd61f8 100644
--- a/codemash/settings.py
+++ b/codemash/settings.py
@@ -93,6 +93,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -124,6 +125,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'django.contrib.flatpages',
 
     'contact',
     'accounts',
diff --git a/codemash/urls.py b/codemash/urls.py
index 68896ca..762679a 100644
--- a/codemash/urls.py
+++ b/codemash/urls.py
@@ -13,6 +13,6 @@ urlpatterns = patterns('',
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
 
-    url(r'^$', 'pages.views.home', name='home'),
-
+    url(r'^$', 'django.contrib.flatpages.views.flatpage', { 'url': '/' },
+        name='home'),
 )
diff --git a/templates/base.html b/templates/base.html
index a394d69..9bd1339 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -13,6 +13,7 @@
         {% if user.is_staff %}
             <li><a href="{% url 'admin:index' %}">Admin Area</a></li>
         {% endif %}
+            <li><a href="{% url 'contact:form' %}">Contact Us</a></li>
         {% if user.is_authenticated %}
             <li><a href="{% url 'account:profile' %}">{{ user.username }}'s profile</a></li>
             <li><a href="{% url 'auth:logout' %}">Logout ({{ user.username }})</a></li>
diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html
new file mode 100644
index 0000000..55baf71
--- /dev/null
+++ b/templates/flatpages/default.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block title %}{{ flatpage.title }}{% endblock %}
+{% block content %}
+{{ flatpage.content }}
+{% endblock %}