X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=settings.py;h=fdfa66e178f86dbe621b464ce6cda055d6ce7d9b;hb=6441b6d77723178b4456deca4189723205abfada;hp=15de0b1e83fafd310d4bb4f3a68c2bd7c7e53535;hpb=e0a6b803cd22cdf9b2b5a1e70cfaf4d377c7efa3;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/settings.py b/settings.py
index 15de0b1..fdfa66e 100644
--- a/settings.py
+++ b/settings.py
@@ -9,10 +9,11 @@ from dbsettings import *
 PROJECT_DIR = os.path.dirname(__file__)
 
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
+TEMPLATE_DEBUG = False
 
 ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
+    # Server errors get sent here
+    ('Matthijs Kooijman', 'matthijs@stdin.nl'),
 )
 
 MANAGERS = ADMINS
@@ -43,20 +44,16 @@ USE_I18N = True
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
 
 # URL that handles the media served from MEDIA_ROOT.
 # Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
-# URL prefix for static files. Will be made available by
-# xerxes.tools.context_processors.static
-STATIC_URL_PREFIX = '/static/'
+MEDIA_URL = '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/admin/media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '6-zo+-1@-342%k4%82aw#kxr4f%5w00xhwby5$&fa@+!dh@(2='
@@ -91,20 +88,20 @@ INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
-    'django.contrib.sites',
     'django.contrib.admin',
     'xerxes.events',
     'xerxes.influences',
     'xerxes.base',
     'xerxes.tools',
+    'threadedcomments',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
-    # Add STATIC_URL_PREFIX to the context
-    "xerxes.tools.context_processors.static",
+    "django.core.context_processors.media",
+    "django.core.context_processors.request",
 )
 
 LOGIN_URL = "/accounts/login/"