Update settings

1 files changed, 23 insertions, 5 deletions

diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py
index 22502b2..aa44f5a 100644
--- a/chimere/settings.sample.py
+++ b/chimere/settings.sample.py
@@ -4,7 +4,7 @@
 # Don't edit this file:
 # overload all theses settings in your local_settings.py file
 
-import os
+import os, sys
 _ = lambda s: s
 
 DEBUG = False
@@ -19,6 +19,8 @@ CONTACT_EMAIL = ''
 STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
+STATICFILES_DIRS = (ROOT_PATH + 'project_static',)
+
 TINYMCE_URL = '/tinymce/'
 JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
                   '/javascript/jquery-ui/jquery-ui.js',)
@@ -40,8 +42,8 @@ CHIMERE_EPSG_PROJECTION = 900913
 # projection displayed to the end user by openlayers
 # chimere use the same projection to save its data in the database
 CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
-# display of shortcuts for areas
-CHIMERE_DISPLAY_AREAS = True
+# display of shortcuts for maps
+CHIMERE_DISPLAY_MAPS = 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
@@ -106,12 +108,24 @@ est trop dangereux.</p>"""
 
 NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search'
 
+# Fields used to geolocate with nominatim (http://wiki.openstreetmap.org/wiki/Nominatim#Search)
+# from external sources. Key must be a valid parameters for Nominatim. If given
+# value are property slugs use the corresponding value otherwise use it as a
+# fixed value
+# e.g : {'street':'address', 'city':'city', 'country':u'France'}
+CHIMERE_NOMINATIM_FIELDS = {}
+
 # thumbnail
 CHIMERE_THUMBS_SCALE_HEIGHT=250
 CHIMERE_THUMBS_SCALE_WIDTH=None
 
 CHIMERE_CSV_ENCODING = 'ISO-8859-1'
 
+CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute', 'rss', 'contact']
+
+# generic contact email
+CONTACT_EMAIL = ''
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -129,6 +143,9 @@ DATABASES = {
     },
 }
 
+if 'test' in sys.argv:
+    SOUTH_TESTS_MIGRATE = False
+
 # 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
 # although not all variations may be possible on all operating systems.
@@ -296,7 +313,8 @@ if 'MAP_JS_URLS' not in globals():
             ],
         'leaflet':[
             STATIC_URL + "leaflet/leaflet.js",
-            STATIC_URL + "chimere/js/jquery.chimere-leaflet.js"
+            STATIC_URL + "chimere/js/jquery.chimere-leaflet.js",
+            "http://maps.stamen.com/js/tile.stamen.js?v1.2.1"
             ]
     }
     if CHIMERE_ENABLE_CLUSTERING:
@@ -318,7 +336,7 @@ if 'MAP_CSS_URLS' not in globals():
                        None)],
         'leaflet':[
          (STATIC_URL + "leaflet/leaflet.css", None),
-         (STATIC_URL + "leaflet/leaflet.ie.css", 'lte IE 8')
+         (STATIC_URL + "leaflet/leaflet.ie.css", 'lte IE 8'),
          (STATIC_URL + "leaflet-markercluster/MarkerCluster.css", None),
          (STATIC_URL + "leaflet-markercluster/MarkerCluster.Default.css", None),
          (STATIC_URL + "leaflet-markercluster/MarkerCluster.Default.ie.css",