projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a custom comment preview view for influences.
[matthijs/projects/xerxes.git]
/
settings.py
diff --git
a/settings.py
b/settings.py
index e66d70964fa448c0c65622a71f461cf96e280c8b..fdfa66e178f86dbe621b464ce6cda055d6ce7d9b 100644
(file)
--- a/
settings.py
+++ b/
settings.py
@@
-44,20
+44,16
@@
USE_I18N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
# 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"
# 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/".
# 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='
# Make this unique, and don't share it with anybody.
SECRET_KEY = '6-zo+-1@-342%k4%82aw#kxr4f%5w00xhwby5$&fa@+!dh@(2='
@@
-104,8
+100,8
@@
TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"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/"
)
LOGIN_URL = "/accounts/login/"