diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/map-OpenLayers.js | 4 | ||||
| -rw-r--r-- | www/js/views/around.js | 8 | ||||
| -rw-r--r-- | www/templates/en/around.html | 5 |
3 files changed, 6 insertions, 11 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(); diff --git a/www/templates/en/around.html b/www/templates/en/around.html index 1b79b40..fd6912e 100644 --- a/www/templates/en/around.html +++ b/www/templates/en/around.html @@ -2,9 +2,10 @@ <a id="view-my-reports" class="nodisplay" data-role="button" href="#"> Drafts <span class="draft_count"><% print( FMS.allDrafts.length ) %></span> </a> - <a id="cancel" class="nodisplay" data-role="button">Cancel</a> + <a id="cancel" class="nodisplay" data-role="button" data-icon="arrow-l">Cancel</a> <h1>Find problem</h1> <a id="login-options" class="nodisplay ui-btn-right">Account</a> + <a id="confirm" class="nodisplay" data-role="button" data-iconpos="right" data-icon="arrow-r">Next</a> </div> <div data-role="content"> @@ -62,8 +63,6 @@ <a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn"> New Report Here </a> - <a id="confirm" data-role="button" data-theme="a" class="map-bottom-btn nodisplay"> - Confirm location </a> </div> |