diff options
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/chimere/widgets.py b/chimere/widgets.py index c2a6d60..2f4b8e7 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -29,7 +29,7 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ URL_OSM_CSS = ["http://www.openlayers.org/api/theme/default/style.css"] -URL_OSM_JS = [settings.STATIC_URL+"OpenLayers.js", +URL_OSM_JS = [settings.STATIC_URL + "chimere/js/OpenLayers.js", "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] def getMapJS(area_name=''): @@ -37,21 +37,22 @@ def getMapJS(area_name=''): ''' # projection, center and bounds definitions js = u"var epsg_display_projection = new OpenLayers.Projection('EPSG:%d')\ -;\n" % settings.EPSG_DISPLAY_PROJECTION +;\n" % settings.CHIMERE_EPSG_DISPLAY_PROJECTION + js += u"OpenLayers.ImgPath = '%schimere/img/';\n" % settings.STATIC_URL js += u"var epsg_projection = new OpenLayers.Projection('EPSG:%d');\n" % \ - settings.EPSG_PROJECTION + settings.CHIMERE_EPSG_PROJECTION js += u"var centerLonLat = new OpenLayers.LonLat(%f,\ %f).transform(epsg_display_projection, epsg_projection);\n" % \ - settings.DEFAULT_CENTER + settings.CHIMERE_DEFAULT_CENTER js += u"var media_path = '%s';\n" % settings.STATIC_URL - js += u"var map_layer = %s;\n" % settings.MAP_LAYER + js += u"var map_layer = %s;\n" % settings.CHIMERE_MAP_LAYER js += u"var restricted_extent;\n" if area_name: js += u"var area_name='%s';\n" % area_name - if settings.RESTRICTED_EXTENT: + if settings.CHIMERE_RESTRICTED_EXTENT: restricted_extent_str = [str(coord) \ - for coord in settings.RESTRICTED_EXTENT] + for coord in settings.CHIMERE_RESTRICTED_EXTENT] js += u"restricted_extent = new OpenLayers.Bounds(%s);\n" %\ ", ".join(restricted_extent_str) js = u"""<script type="text/javascript"><!-- @@ -65,7 +66,7 @@ class TextareaWidget(forms.Textarea): """ class Media: js = ["%stiny_mce.js" % settings.TINYMCE_URL, - "%stextareas.js" % settings.STATIC_URL,] + "%schimere/js/textareas.js" % settings.STATIC_URL,] class PointChooserWidget(forms.TextInput): """ @@ -73,10 +74,10 @@ class PointChooserWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] + "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,] } - js = URL_OSM_JS + ["%sedit_map.js" % settings.STATIC_URL, - "%sbase.js" % settings.STATIC_URL,] + js = URL_OSM_JS + ["%schimere/js/edit_map.js" % settings.STATIC_URL, + "%schimere/js/base.js" % settings.STATIC_URL,] def render(self, name, value, attrs=None, area_name=''): ''' @@ -97,7 +98,7 @@ class PointChooserWidget(forms.TextInput): else: value = None tpl = getMapJS(area_name) - tpl += u'<script src="%sedit_map.js"></script>\n' % settings.STATIC_URL + tpl += u'<script src="%schimere/js/edit_map.js"></script>\n' % settings.STATIC_URL tpl += u"""<div id='map_edit'></div> <div id='live_lonlat'> <p><label for='live_latitude'>%s</label>\ @@ -141,10 +142,10 @@ class RouteChooserWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] + "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,] } - js = ["%sedit_route_map.js" % settings.STATIC_URL, - "%sbase.js" % settings.STATIC_URL,] + URL_OSM_JS + js = ["%schimere/js/edit_route_map.js" % settings.STATIC_URL, + "%schimere/js/base.js" % settings.STATIC_URL,] + URL_OSM_JS def render(self, name, value, attrs=None, area_name='', routefile_id=None): ''' @@ -249,10 +250,10 @@ class AreaWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] + "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,] } - js = URL_OSM_JS + ["%sedit_area.js" % settings.STATIC_URL, - "%sbase.js" % settings.STATIC_URL,] + js = URL_OSM_JS + ["%schimere/js/edit_area.js" % settings.STATIC_URL, + "%schimere/js/base.js" % settings.STATIC_URL,] def render(self, name, value, attrs=None): """ @@ -318,13 +319,14 @@ class AreaField(forms.MultiValueField): class MultiSelectWidget(forms.SelectMultiple): class Media: css = {'all': ( - settings.STATIC_URL + 'jquery/bsmSelect/css/jquery.bsmselect.css', - settings.STATIC_URL + 'jquery/css/jquery.bsmselect.custom.css', + settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css', + settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css', ) } js = ( - settings.STATIC_URL + 'jquery/bsmSelect/js/jquery.bsmselect.js', - settings.STATIC_URL + 'jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', + settings.JQUERY_URL, + settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js', + settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', ) def render(self, name, value, attrs=None): |