Django 1.7 mostly working. Big refactor so probably bugs

1 files changed, 32 insertions, 18 deletions

diff --git a/settings.py b/settings.py
index 2910ac1..1159f4e 100644
--- a/settings.py
+++ b/settings.py
@@ -2,11 +2,16 @@ from localsettings import * #inital localsettings call so that urljoins work
 import os
 import urlparse
 import django
-# Django settings for troggle project.
 
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+# Django settings for troggle project.
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
+ALLOWED_HOSTS = []
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -30,6 +35,7 @@ SITE_ID = 1
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
+USE_L10N = True
 
 FIX_PERMISSIONS = []
 NOTABLECAVESHREFS = [ "161", "204", "258", "76", "107", "264" ]
@@ -69,23 +75,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( authmodule, "core.context.troggle_context", )
 
 LOGIN_REDIRECT_URL = '/'
 
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware', 
-    'troggle.middleware.SmartAppendSlashMiddleware'
-)
-
-ROOT_URLCONF = 'troggle.urls'
-
-ACCOUNT_ACTIVATION_DAYS=3
-
-AUTH_PROFILE_MODULE = 'core.person'
-
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -94,9 +83,11 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.redirects',
     'django.contrib.messages',
+    'django.contrib.staticfiles',
     #'troggle.photologue',
     #'troggle.reversion',
     #'django_evolution',
+    'tinymce',
     'registration',
     'troggle.profiles',
     'troggle.core',
@@ -104,9 +95,32 @@ INSTALLED_APPS = (
     'troggle.imagekit', 
 )
 
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'troggle.middleware.SmartAppendSlashMiddleware'
+)
+
+ROOT_URLCONF = 'troggle.urls'
+
+WSGI_APPLICATION = 'troggle.wsgi.application'
+
+ACCOUNT_ACTIVATION_DAYS=3
+
+AUTH_PROFILE_MODULE = 'core.person'
+
 QM_PATTERN="\[\[\s*[Qq][Mm]:([ABC]?)(\d{4})-(\d*)-(\d*)\]\]"
 
 TINYMCE_JS_URL = 'http://debug.example.org/tiny_mce/tiny_mce_src.js'
+
+#TINYMCE_JS_URL = os.path.join(MEDIA_URL, "tinybibble_mce.js")
+
 TINYMCE_DEFAULT_CONFIG = {
     'plugins': "table,spellchecker,paste,searchreplace",
     'theme': "advanced",