diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-24 22:38:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-24 22:38:43 +0200 |
| commit | 149185cda723c2d60fb581c5014ddedfa3a4fdf9 (patch) | |
| tree | 643043ec2d5b94d9bfb1c27acd58aa105d3b31fd /example_project/settings.py | |
| parent | c76f9631a14e21881329f4f1383d2fd3327d432d (diff) | |
| parent | 02598e2ba0d244ced3d8bb25448d2a7bacf93ba7 (diff) | |
| download | Chimère-149185cda723c2d60fb581c5014ddedfa3a4fdf9.tar.bz2 Chimère-149185cda723c2d60fb581c5014ddedfa3a4fdf9.zip | |
Merge branch 'master' into saclay
Conflicts:
example_project/settings.py
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 750d798..e78751d 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -25,9 +25,6 @@ JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', '/javascript/jquery-ui-themes/base/jquery.ui.all.css') OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] -OSM_JS_URLS = [STATIC_URL + "chimere/js/OpenLayers.js", - STATIC_URL + "chimere/js/SimplePanZoom.js", - "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] GPSBABEL = '/usr/bin/gpsbabel' GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an @@ -99,6 +96,10 @@ CHIMERE_ROUTING_ENGINE = { NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search' +# thumbnail +CHIMERE_THUMBS_SCALE_HEIGHT=250 +CHIMERE_THUMBS_SCALE_WIDTH=None + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) @@ -277,3 +278,10 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals(): ("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s', STATIC_URL + 'chimere/img/identica.png'), ) + +if 'OSM_JS_URLS' not in globals(): + global OSM_JS_URLS + OSM_JS_URLS = [STATIC_URL + "chimere/js/OpenLayers.js", + STATIC_URL + "chimere/js/SimplePanZoom.js", + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] + |