Merge branch 'v2.9'

2 files changed, 15 insertions, 6 deletions

diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py
index e96f2cb..8b55a2d 100644
--- a/chimere_example_project/settings.py
+++ b/chimere_example_project/settings.py
@@ -57,6 +57,10 @@ CHIMERE_DISPLAY_AREAS = True
 # don't forget to run the upgrade.py script to create appropriate fields in
 # the database
 CHIMERE_DAYS_BEFORE_EVENT = 30
+# Dated events must usualy be checked as 'front page' to be displayed
+# on front page - set CHIMERE_ALL_DATED_ARE_FRONT to True if you want to
+# display all events on front page
+CHIMERE_ALL_DATED_ARE_FRONT = True
 # allow feeds
 CHIMERE_FEEDS = True
 # display a directory of items
@@ -71,6 +75,7 @@ CHIMERE_MINIATURE_BY_DEFAULT = False
 # JS definition of the default map (for admin and when no map are defined in
 # the application)
 # cf. OpenLayers documentation for more details
+
 # OSM mapnik map
 CHIMERE_DEFAULT_MAP_LAYER = """new ol.layer.Tile({
     style: 'Road',
@@ -149,9 +154,17 @@ HAYSTACK_CONNECTIONS = {
 HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12
 HAYSTACK_AUTOCOMPLETE = False
 
+# length of short description
+CHIMERE_SHORT_DESC_LENGTH = 400
+
 CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification "
                         u"about this item: ")
 
+CHIMERE_ROUTING_WARN_MESSAGE = "<h3 class='warn'>Attention</h3>"\
+    "<p>Cet itineraire comporte des passages dangereux, nous vous conseillons"\
+    " de modifier votre recherche, en ajoutant par exemple un ou des points "\
+    "d'etape à votre parcours pour eviter les zones de danger.</p>"
+
 CHIMERE_CSV_ENCODING = 'ISO-8859-1'
 
 CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute']
@@ -176,8 +189,6 @@ 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
@@ -190,7 +201,7 @@ TIME_ZONE = 'Europe/Paris'
 # Language code for this installation. All choices can be found here:
 # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
 # http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'fr-fr'
+LANGUAGE_CODE = 'fr-FR'
 
 SITE_ID = 1
 
@@ -265,8 +276,6 @@ INSTALLED_APPS += [
 LOG_PATH = '/var/log/django/'
 MOBILE_DOMAINS = []  # if you have specific domains for mobile access
 
-CHIMERE_VIEW_RENDERER = 'openlayers'  # 'openlayers' or 'leaflet'
-CHIMERE_EDIT_RENDERER = 'openlayers'  # 'openlayers'
 
 try:
     from local_settings import *
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py
index 155696a..df2822f 100644
--- a/chimere_example_project/urls.py
+++ b/chimere_example_project/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2013 Etienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2016 Etienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as