diff options
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 29 | 
1 files changed, 15 insertions, 14 deletions
| diff --git a/chimere/widgets.py b/chimere/widgets.py index 4f09c62..cbc3e19 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -249,11 +249,11 @@ class PointChooserWidget(forms.TextInput):      """      class Media:          css = { -            "all": settings.OSM_CSS_URLS + \ +            "all": settings.MAP_CSS_URLS[settings.CHIMERE_EDIT_RENDERER] + \                     ["%schimere/css/forms.css" % settings.STATIC_URL,]          } -        js = settings.OSM_JS_URLS + list(settings.JQUERY_JS_URLS) + \ -             ["%schimere/js/jquery.chimere.js" % settings.STATIC_URL] +        js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ +             list(settings.JQUERY_JS_URLS)      def render(self, name, value, attrs=None, area_name=''):          ''' @@ -316,12 +316,13 @@ class RouteChooserWidget(forms.TextInput):      Manage the edition of route on a map      """      class Media: -        css = {"all": settings.OSM_CSS_URLS + \ -                      ["%schimere/css/forms.css" % settings.STATIC_URL,] +        css = { +            "all": settings.MAP_CSS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ +                   ["%schimere/css/forms.css" % settings.STATIC_URL,]          } -        js = settings.OSM_JS_URLS + list(settings.JQUERY_JS_URLS) + \ -             ["%schimere/js/jquery.chimere.js" % settings.STATIC_URL, -              "%schimere/js/edit_route_map.js" % settings.STATIC_URL, +        js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ +             list(settings.JQUERY_JS_URLS) + \ +             ["%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): @@ -453,11 +454,11 @@ class AreaWidget(forms.TextInput):      """      class Media:          css = { -            "all": settings.OSM_CSS_URLS + \ +            "all": settings.MAP_CSS_URLS[settings.CHIMERE_EDIT_RENDERER] + \                     ["%schimere/css/forms.css" % settings.STATIC_URL,]          } -        js = settings.OSM_JS_URLS + [ -              "%schimere/js/edit_area.js" % settings.STATIC_URL, +        js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ +             ["%schimere/js/edit_area.js" % settings.STATIC_URL,                "%schimere/js/base.js" % settings.STATIC_URL,]      def get_bounding_box_from_value(self, value): @@ -552,11 +553,11 @@ class ImportFiltrWidget(AreaWidget):      """      class Media:          css = { -            "all": settings.OSM_CSS_URLS + \ +            "all": settings.MAP_CSS_URLS[settings.CHIMERE_EDIT_RENDERER] + \                     ["%schimere/css/forms.css" % settings.STATIC_URL,]          } -        js = settings.OSM_JS_URLS + [ -              "%schimere/js/edit_area.js" % settings.STATIC_URL, +        js = settings.MAP_JS_URLS[settings.CHIMERE_EDIT_RENDERER] + \ +             ["%schimere/js/edit_area.js" % settings.STATIC_URL,                "%schimere/js/base.js" % settings.STATIC_URL,]      def render(self, name, value, attrs=None): | 
