diff options
| -rw-r--r-- | chimere/settings.sample.py | 16 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere-ol.js (renamed from chimere/static/chimere/js/jquery.chimere.js) | 0 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/head_chimere.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/main_map.html | 1 | ||||
| -rw-r--r-- | chimere/widgets.py | 6 |
5 files changed, 12 insertions, 13 deletions
diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py index c8fdb91..2e5ad40 100644 --- a/chimere/settings.sample.py +++ b/chimere/settings.sample.py @@ -1,7 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# This file is an example of settings.py for a Chimère project +# Don't edit this file: +# overload all theses settings in your local_settings.py file import os _ = lambda s: s @@ -68,13 +69,13 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'test' CHIMERE_OSM_PASSWORD = 'test' +# encoding for shapefile import +CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1' + # as the web server need to be reloaded when property models are changed # it could be a good idea to hide it to an admin who could'nt do that CHIMERE_HIDE_PROPERTYMODEL = False -# encoding for shapefile import -CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1' - # enable routing in Chimère CHIMERE_ENABLE_ROUTING = False @@ -288,9 +289,11 @@ if 'MAP_JS_URLS' not in globals(): 'openlayers':[ STATIC_URL + "openlayers/OpenLayers.js", STATIC_URL + "openlayers/SimplePanZoom.js", - "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"], + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js", + STATIC_URL + "chimere/js/jquery.chimere-ol.js"], 'leaflet':[ - STATIC_URL + "leaflet/leaflet.js" + STATIC_URL + "leaflet/leaflet.js", + STATIC_URL + "chimere/js/jquery.chimere-leaflet.js" ] } @@ -303,3 +306,4 @@ if 'MAP_CSS_URLS' not in globals(): STATIC_URL + "leaflet/leaflet.ie.css" ] } + diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere-ol.js index 2e2d238..2e2d238 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere-ol.js diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html index 8863f10..099a044 100644 --- a/chimere/templates/chimere/blocks/head_chimere.html +++ b/chimere/templates/chimere/blocks/head_chimere.html @@ -3,8 +3,6 @@ {% for js_url in MAP_JS_URLS %} <script src="{{ js_url }}" type="text/javascript"></script>{% endfor %} {% if routing %}<script src="{{ STATIC_URL }}chimere/js/routing-widget.js" type="text/javascript"></script>{% endif %} -<script src="{{ STATIC_URL }}chimere/js/clustering.js" type="text/javascript"></script> -<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script> <script type="text/javascript"> /* Global variables */ var STATIC_URL = static_url = "{{ STATIC_URL }}"; diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index b7aa868..e8bdfe1 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -4,7 +4,6 @@ {% head_jquery %} {% head_chimere %} {% head_jme %} -<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script> {{ block.super }} {% endblock %} {% block message_edit %}{% endblock %} diff --git a/chimere/widgets.py b/chimere/widgets.py index f39248c..c2e8832 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -252,8 +252,7 @@ class PointChooserWidget(forms.TextInput): ["%schimere/css/forms.css" % settings.STATIC_URL,] } js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ - list(settings.JQUERY_JS_URLS) + \ - ["%schimere/js/jquery.chimere.js" % settings.STATIC_URL] + list(settings.JQUERY_JS_URLS) def render(self, name, value, attrs=None, area_name=''): ''' @@ -347,8 +346,7 @@ class RouteChooserWidget(forms.TextInput): } js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ list(settings.JQUERY_JS_URLS) + \ - ["%schimere/js/jquery.chimere.js" % settings.STATIC_URL, - "%schimere/js/edit_route_map.js" % settings.STATIC_URL, + ["%schimere/js/edit_route_map.js" % settings.STATIC_URL, "%schimere/js/base.js" % settings.STATIC_URL,] def render(self, name, value, attrs=None, area_name='', routefile_id=None): |