summaryrefslogtreecommitdiff
path: root/papillon/settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'papillon/settings.py')
-rw-r--r--papillon/settings.py31
1 files changed, 16 insertions, 15 deletions
diff --git a/papillon/settings.py b/papillon/settings.py
index 49b46c5..7a32140 100644
--- a/papillon/settings.py
+++ b/papillon/settings.py
@@ -10,14 +10,20 @@ TEMPLATE_DEBUG = DEBUG
import os
PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
-EXTRA_URL = 'papillon/'
+EXTRA_URL = ''
+
+STATIC_URL = '/static/'
TINYMCE_URL = 'http://localhost/tinymce/'
-MAX_COMMENT_NB = 10 # max number of comments by poll - 0 to disable comments
-ALLOW_FRONTPAGE_POLL = False # disabled is recommanded for public instance
+MAX_COMMENT_NB = 10 # max number of comments by poll - 0 to disable comments
+ALLOW_FRONTPAGE_POLL = False # disabled is recommanded for public instance
# time to live in days
DAYS_TO_LIVE = 30
+STATICFILES_DIRS = [
+ os.path.join(PROJECT_PATH, "static"),
+]
+
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
@@ -27,16 +33,13 @@ MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': PROJECT_PATH + '/papillon.db', # Or path to database file if using sqlite3.
- 'USER': '', # Not used with sqlite3.
- 'PASSWORD': '', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ 'NAME': PROJECT_PATH + '/papillon.db',
}
}
# Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html
+# #DATETIME-TIMEZONE-SET-TABLE
# although not all variations may be possible on all operating systems.
# If running in a Windows environment this must be set to the same as your
# system time zone.
@@ -55,7 +58,7 @@ USE_I18N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = PROJECT_PATH + '/static/'
+MEDIA_ROOT = PROJECT_PATH + '/media/'
# URL that handles the media served from MEDIA_ROOT.
# Example: "http://media.lawrence.com"
@@ -87,14 +90,12 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'papillon.urls'
TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
PROJECT_PATH + '/templates',
)
INSTALLED_APPS = (
# contribs
+ 'django.contrib.staticfiles',
'django.contrib.auth',
'django.contrib.admin',
'django.contrib.contenttypes',
@@ -110,8 +111,8 @@ INSTALLED_APPS = (
)
LANGUAGES = (
- ('fr', 'Français'),
- ('en', 'English'),
+ ('fr', 'Français'),
+ ('en', 'English'),
)
try: