Many changes on templates and styles

1 files changed, 11 insertions, 16 deletions

diff --git a/chimere/widgets.py b/chimere/widgets.py
index 2f4b8e7..d12f2e6 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -20,7 +20,7 @@
 """
 Extra widgets and fields
 """
-
+from django import conf
 from django import forms
 from django.conf import settings
 from django.contrib.gis.db import models
@@ -28,10 +28,6 @@ from django.contrib.gis.geos import fromstr
 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 + "chimere/js/OpenLayers.js",
-          "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
-
 def getMapJS(area_name=''):
     '''Variable initialization for drawing the map
     '''
@@ -74,9 +70,9 @@ class PointChooserWidget(forms.TextInput):
     """
     class Media:
         css = {
-            "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
+            "all": settings.OSM_CSS_URLS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
         }
-        js = URL_OSM_JS + ["%schimere/js/edit_map.js" % settings.STATIC_URL,
+        js = settings.OSM_JS_URLS + ["%schimere/js/edit_map.js" % settings.STATIC_URL,
                            "%schimere/js/base.js" % settings.STATIC_URL,]
 
     def render(self, name, value, attrs=None, area_name=''):
@@ -142,10 +138,10 @@ class RouteChooserWidget(forms.TextInput):
     """
     class Media:
         css = {
-            "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
+            "all": settings.OSM_CSS_URLS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
         }
         js = ["%schimere/js/edit_route_map.js" % settings.STATIC_URL,
-              "%schimere/js/base.js" % settings.STATIC_URL,] + URL_OSM_JS
+              "%schimere/js/base.js" % settings.STATIC_URL,] + settings.OSM_JS_URLS
 
     def render(self, name, value, attrs=None, area_name='', routefile_id=None):
         '''
@@ -250,9 +246,9 @@ class AreaWidget(forms.TextInput):
     """
     class Media:
         css = {
-            "all": URL_OSM_CSS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
+            "all": settings.OSM_CSS_URLS + ["%schimere/css/forms.css" % settings.STATIC_URL,]
         }
-        js = URL_OSM_JS + ["%schimere/js/edit_area.js" % settings.STATIC_URL,
+        js = settings.OSM_JS_URLS + ["%schimere/js/edit_area.js" % settings.STATIC_URL,
               "%schimere/js/base.js" % settings.STATIC_URL,]
 
     def render(self, name, value, attrs=None):
@@ -318,16 +314,15 @@ class AreaField(forms.MultiValueField):
 
 class MultiSelectWidget(forms.SelectMultiple):
     class Media:
-        css = {'all': (
+        css = {'all': list(settings.JQUERY_CSS_URLS) + [
             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.JQUERY_URL,
+        js = list(settings.JQUERY_JS_URLS) + [
             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):
         rendered = super(MultiSelectWidget, self).render(name, value, attrs)