diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-26 15:07:06 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-26 15:07:06 +0100 |
| commit | 39aa9efc8b4520363af76848ff7ddfcc8b08f2bc (patch) | |
| tree | 3b34cb7652184c20e4e927e8ea475b7dc330a2c8 | |
| parent | 30b0bbd815567edc34acd75de06aac523e382f48 (diff) | |
| parent | d3321c3eba1d1aea9ea0e75b999c540fc55ffb59 (diff) | |
| download | Chimère - projet de référence-39aa9efc8b4520363af76848ff7ddfcc8b08f2bc.tar.bz2 Chimère - projet de référence-39aa9efc8b4520363af76848ff7ddfcc8b08f2bc.zip | |
Merge branch 'v2.1' into carteouverte
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | project_static/.project_static | 0 | ||||
| -rw-r--r-- | settings.py | 19 |
3 files changed, 15 insertions, 8 deletions
@@ -4,5 +4,7 @@ *.mo *.ignore static -media local_settings.py +media/* +static/* +*.pyc diff --git a/project_static/.project_static b/project_static/.project_static new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project_static/.project_static diff --git a/settings.py b/settings.py index dddae59..47fab7b 100644 --- a/settings.py +++ b/settings.py @@ -9,6 +9,7 @@ _ = lambda s: s DEBUG = False TEMPLATE_DEBUG = DEBUG +MOBILE_TEST = False # Django settings for chimere project. PROJECT_NAME = 'Chimere' @@ -32,7 +33,7 @@ OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] GPSBABEL = '/usr/bin/gpsbabel' GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an - # error of 5 meters + # error of 5 meters #GPSBABEL_OPTIONS = 'simplify,count=100' ## chimere specific ## @@ -84,7 +85,7 @@ CHIMERE_HIDE_PROPERTYMODEL = False # clustering of markers CHIMERE_ENABLE_CLUSTERING = False -# enable routing in Chimère +# enable routing in Chimere CHIMERE_ENABLE_ROUTING = False CHIMERE_ROUTING_TRANSPORT = (('foot', _(u"Foot")), @@ -106,8 +107,8 @@ CHIMERE_ROUTING_ENGINE = { } CHIMERE_ROUTING_FAIL_MESSAGE = u"""<h3 class='warn'>Attention</h3> -<p>Le moteur de routage a échoué dans sa recherche de trajet. Les points de -départ ou d'arrivée sont peut-être trop loin d'une voie existante ou le trajet +<p>Le moteur de routage a echoue dans sa recherche de trajet. Les points de +depart ou d'arrivee sont peut-etre trop loin d'une voie existante ou le trajet est trop dangereux.</p>""" NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search' @@ -139,8 +140,7 @@ HAYSTACK_CONNECTIONS = { CHIMERE_CSV_ENCODING = 'ISO-8859-1' CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute'] -CHIMERE_DEFAULT_ACTION_LABEL = [u"Cartes", u"Ajouter un élément"] - +CHIMERE_DEFAULT_ACTION_LABEL = [u"Cartes", u"Ajouter un element"] # generic contact email CONTACT_EMAIL = '' @@ -253,6 +253,7 @@ 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' @@ -372,4 +373,8 @@ if 'OSM_JS_URLS' not in globals(): OSM_JS_URLS = [STATIC_URL + "openlayers/OpenLayers.js", STATIC_URL + "openlayers/SimplePanZoom.js", "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] - +if 'OSM_MOBILE_JS_URLS' not in globals(): + global OSM_MOBILE_URLS + OSM_JS_MOBILE_URLS = [STATIC_URL + "openlayers/OpenLayers.mobile.js", + STATIC_URL + "openlayers/SimplePanZoom.js", + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] |