diff options
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/chimere/widgets.py b/chimere/widgets.py index ec63ea3..c2a6d60 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.MEDIA_URL+"OpenLayers.js", +URL_OSM_JS = [settings.STATIC_URL+"OpenLayers.js", "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] def getMapJS(area_name=''): @@ -43,7 +43,7 @@ def getMapJS(area_name=''): js += u"var centerLonLat = new OpenLayers.LonLat(%f,\ %f).transform(epsg_display_projection, epsg_projection);\n" % \ settings.DEFAULT_CENTER - js += u"var media_path = '%s';\n" % settings.MEDIA_URL + js += u"var media_path = '%s';\n" % settings.STATIC_URL js += u"var map_layer = %s;\n" % settings.MAP_LAYER js += u"var restricted_extent;\n" @@ -65,7 +65,7 @@ class TextareaWidget(forms.Textarea): """ class Media: js = ["%stiny_mce.js" % settings.TINYMCE_URL, - "%stextareas.js" % settings.MEDIA_URL,] + "%stextareas.js" % settings.STATIC_URL,] class PointChooserWidget(forms.TextInput): """ @@ -73,10 +73,10 @@ class PointChooserWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.MEDIA_URL,] + "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] } - js = URL_OSM_JS + ["%sedit_map.js" % settings.MEDIA_URL, - "%sbase.js" % settings.MEDIA_URL,] + js = URL_OSM_JS + ["%sedit_map.js" % settings.STATIC_URL, + "%sbase.js" % settings.STATIC_URL,] def render(self, name, value, attrs=None, area_name=''): ''' @@ -97,7 +97,7 @@ class PointChooserWidget(forms.TextInput): else: value = None tpl = getMapJS(area_name) - tpl += u'<script src="%sedit_map.js"></script>\n' % settings.MEDIA_URL + tpl += u'<script src="%sedit_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 +141,10 @@ class RouteChooserWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.MEDIA_URL,] + "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] } - js = ["%sedit_route_map.js" % settings.MEDIA_URL, - "%sbase.js" % settings.MEDIA_URL,] + URL_OSM_JS + js = ["%sedit_route_map.js" % settings.STATIC_URL, + "%sbase.js" % settings.STATIC_URL,] + URL_OSM_JS def render(self, name, value, attrs=None, area_name='', routefile_id=None): ''' @@ -176,7 +176,7 @@ _(u"To delete a point move the mouse cursor over it and press the \"d\" or \ _(u"To add a point click in the middle of a segment and drag the new point to \ the desired position")) tpl += u'<script src="%sedit_route_map.js"></script>\n' % \ - settings.MEDIA_URL + settings.STATIC_URL if not value: # upload a file tpl += u"""<script type='text/javascript'><!-- @@ -249,10 +249,10 @@ class AreaWidget(forms.TextInput): """ class Media: css = { - "all": URL_OSM_CSS + ["%sforms.css" % settings.MEDIA_URL,] + "all": URL_OSM_CSS + ["%sforms.css" % settings.STATIC_URL,] } - js = URL_OSM_JS + ["%sedit_area.js" % settings.MEDIA_URL, - "%sbase.js" % settings.MEDIA_URL,] + js = URL_OSM_JS + ["%sedit_area.js" % settings.STATIC_URL, + "%sbase.js" % settings.STATIC_URL,] def render(self, name, value, attrs=None): """ @@ -318,13 +318,13 @@ class AreaField(forms.MultiValueField): class MultiSelectWidget(forms.SelectMultiple): class Media: css = {'all': ( - settings.MEDIA_URL + 'jquery/bsmSelect/css/jquery.bsmselect.css', - settings.MEDIA_URL + 'jquery/css/jquery.bsmselect.custom.css', + settings.STATIC_URL + 'jquery/bsmSelect/css/jquery.bsmselect.css', + settings.STATIC_URL + 'jquery/css/jquery.bsmselect.custom.css', ) } js = ( - settings.MEDIA_URL + 'jquery/bsmSelect/js/jquery.bsmselect.js', - settings.MEDIA_URL + 'jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', + settings.STATIC_URL + 'jquery/bsmSelect/js/jquery.bsmselect.js', + settings.STATIC_URL + 'jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', ) def render(self, name, value, attrs=None): |