Merge branch 'master' into carte-ouverte

Conflicts:

	.gitignore
	chimere/main/actions.py
	chimere/urls.py

1 files changed, 24 insertions, 8 deletions

diff --git a/chimere/settings.py.example b/chimere/settings.py.example
index c0f6cb6..48785d5 100644
--- a/chimere/settings.py.example
+++ b/chimere/settings.py.example
@@ -31,6 +31,12 @@ DYNAMIC_CATEGORIES = False
 DISPLAY_AREAS = True
 # specific css for areas
 CSS_AREAS = True
+# number of day before an event to display
+# if equal to 0: disable event management
+# if you change this value from 0 to a value in a production environnement
+# don't forget to run the upgrade.py script to create appropriate fields in
+# the database
+DAYS_BEFORE_EVENT = 30
 
 # default id category to check on the map
 DEFAULT_CATEGORIES = [1]
@@ -49,12 +55,16 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'postgresql_psycopg2'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'ratatouille'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'ratatouille'             # Not used with sqlite3.
-DATABASE_PASSWORD = 'wiki'         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASES = {
+    'default': {
+        'NAME': 'ratatouille',
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'HOST': 'localhost',
+        'PORT': '5432',
+        'USER': 'ratatouille',
+        'PASSWORD': 'wiki',
+    },
+}
 
 # 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
@@ -118,12 +128,12 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'chimere.urls'
 
-TEMPLATE_DIRS = (
+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.
     ROOT_PATH + 'templates',
-)
+]
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -132,5 +142,11 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'chimere.main',
+    # activate it if you want to use migration scripts
     'chimere.scripts',
+    # activate it if you want to use RSS feeds
+    'chimere.rss'
 )
+
+if 'chimere.rss' in INSTALLED_APPS:
+    TEMPLATE_DIRS.append(ROOT_PATH + 'rss/templates')