X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=blobdiff_plain;f=settings.py;h=5ed30bfd1e406cd3d2cb0ea62fb3f02263c3669e;hp=9b20669291b8a702718c5f7195dafb34f230abd9;hb=d8acd479311086f3372ed61688a7468356198a04;hpb=d15bbfa3bcde826f90cd7c6c34682d7889635b33

diff --git a/settings.py b/settings.py
index 9b20669..5ed30bf 100644
--- a/settings.py
+++ b/settings.py
@@ -9,7 +9,7 @@ from dbsettings import *
 PROJECT_DIR = os.path.dirname(__file__)
 
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
+TEMPLATE_DEBUG = False
 
 ADMINS = (
     # Server errors get sent here
@@ -36,28 +36,22 @@ LANGUAGES = (
     ('en', 'English'),
 )
 
-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
 
 # 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='
@@ -97,14 +91,15 @@ INSTALLED_APPS = (
     '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/"
@@ -119,6 +114,11 @@ AUTHENTICATION_BACKENDS = (
 
 AUTH_PROFILE_MODULE = 'base.UserProfile'
 
+# Max length for comments, in characters.
+DEFAULT_MAX_COMMENT_LENGTH = 3000
+
+INTERNAL_IPS = ('127.0.0.1')
+
 # Import local settings, that are specific to this installation. These
 # can override any settings specified here.
 try: