diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-06-21 13:51:27 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-06-21 13:51:27 +0100 |
| commit | 914bc0b09ee87874d8d66f96747aacef5786d2a8 (patch) | |
| tree | b7a4143281a96720d89ec3ab4e83f6e31099f4d0 /www/js | |
| parent | c08163f07f19752a0604f72b84ec26bc503db35c (diff) | |
move confirm button up to toolbar and make it a next button
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/map-OpenLayers.js | 4 | ||||
| -rw-r--r-- | www/js/views/around.js | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/www/js/map-OpenLayers.js b/www/js/map-OpenLayers.js index cc14f99..2be1f48 100644 --- a/www/js/map-OpenLayers.js +++ b/www/js/map-OpenLayers.js @@ -139,8 +139,6 @@ function fixmystreet_onload() { fixmystreet.map.removePopup(popup); popup.destroy(); feature.popup = null; - $('#view-my-reports').show(); - $('#login-options').show(); $('#OpenLayers_Control_Crosshairs_crosshairs').show(); }); fixmystreet.markers.events.register( 'featureselected', fixmystreet.markers, function(evt) { @@ -154,8 +152,6 @@ function fixmystreet_onload() { true, onPopupClose); feature.popup = popup; fixmystreet.map.addPopup(popup); - $('#view-my-reports').hide(); - $('#login-options').hide(); $('#OpenLayers_Control_Crosshairs_crosshairs').hide(); }); fixmystreet.map.addControl( fixmystreet.select_feature ); diff --git a/www/js/views/around.js b/www/js/views/around.js index aeff46d..2b17ce6 100644 --- a/www/js/views/around.js +++ b/www/js/views/around.js @@ -129,7 +129,7 @@ $('#relocate').show(); if ( this.model.get('lat') ) { $('#cancel').addClass('ui-btn-left').show(); - $('#confirm').show(); + $('#confirm').addClass('ui-btn-right ui-btn-icon-right').show(); $('#view-my-reports').hide(); $('#login-options').hide(); $('#mark-here').hide(); @@ -138,7 +138,7 @@ fixmystreet.select_feature.deactivate(); } else { $('#cancel').hide().removeClass('ui-btn-left'); - $('#confirm').hide(); + $('#confirm').hide().removeClass('ui-btn-right ui-btn-icon-right'); $('#view-my-reports').show(); $('#login-options').show(); $('#mark-here').show(); @@ -151,7 +151,7 @@ onClickMark: function(e) { e.preventDefault(); $('#cancel').addClass('ui-btn-left').show(); - $('#confirm').show(); + $('#confirm').addClass('ui-btn-right ui-btn-icon-right').show(); $('#view-my-reports').hide(); $('#login-options').hide(); $('#mark-here').hide(); @@ -166,7 +166,7 @@ onClickCancel: function(e) { e.preventDefault(); $('#cancel').hide().removeClass('ui-btn-left'); - $('#confirm').hide(); + $('#confirm').hide().removeClass('ui-btn-right ui-btn-icon-right'); $('#view-my-reports').show(); $('#login-options').show(); $('#mark-here').show(); |