From 6790787ce9dd1ea080fec4fdc5a36ffa851cf9ed Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Thu, 1 Nov 2012 15:17:53 +0100
Subject: Minor UI adaptation

---
 chimere/forms.py                            |  4 ++--
 chimere/static/chimere/js/jquery.chimere.js |  2 +-
 chimere/static/chimere/js/routing-widget.js | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'chimere')

diff --git a/chimere/forms.py b/chimere/forms.py
index 5c759c9..2cf463f 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -563,13 +563,13 @@ class RoutingForm(forms.Form):
     start = forms.CharField(label=_(u"Start"), widget=NominatimWidget)
     end = forms.CharField(label=_(u"Finish"), widget=NominatimWidget)
     speed = forms.ChoiceField(label=_(u"Speed"), choices=[],
-                              required=False)
+                              required=False, widget=forms.RadioSelect)
 
     def __init__(self, *args, **kwargs):
         super(RoutingForm, self).__init__(*args, **kwargs)
         if not settings.CHIMERE_ROUTING_SPEEDS:
             self.fields.pop('speed')
-        self.fields['speed'].widget.choices = [('', '--')]
+        self.fields['speed'].widget.choices = []
         for transport in settings.CHIMERE_ROUTING_SPEEDS:
             for speed, lbl in settings.CHIMERE_ROUTING_SPEEDS[transport]:
                 self.fields['speed'].widget.choices.append(
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index b41f516..ae74d6b 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -996,7 +996,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             cloned.children("#nominatim_start_label").attr('id', c_id+'_label'
                                                     ).html('');
             cloned.children('label[for="id_start"]').html(step_label
-                                                   ).attr('for', "");
+                                    ).attr('for', "").addClass('step_label');
             var id_suffixes = ['_lat', '_lon', ''];
             for (idx=0;idx < id_suffixes.length;idx+=1){
                 var suffix = id_suffixes[idx];
diff --git a/chimere/static/chimere/js/routing-widget.js b/chimere/static/chimere/js/routing-widget.js
index 043c957..34ca46c 100644
--- a/chimere/static/chimere/js/routing-widget.js
+++ b/chimere/static/chimere/js/routing-widget.js
@@ -26,16 +26,16 @@ $(document).ready(function() {
     function filter_speed(transport){
         $("#id_speed_div").show();
         for (i=0;i<detached_speeds.length;i+=1){
-            $("#id_speed").append(detached_speeds[i]);
+            $("#id_speed_div ul").append(detached_speeds[i]);
         }
         detached_speeds = Array();
-        $("#id_speed option").each(function(){
+        $("#id_speed_div input[type=radio]").each(function(){
             if(!$(this).val().match(transport) && $(this).val()){
-                detached_speeds.push($(this).detach());
+                detached_speeds.push($(this).parent().parent().detach());
             }
         });
-        $('#id_speed').val('');
-        if($("#id_speed option").length == 1){
+        $('#id_speed_div').val('');
+        if($("#id_speed_div input[type=radio]").length == 1){
             $("#id_speed_div").hide();
         }
     }
-- 
cgit v1.2.3