diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-08-20 10:49:25 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-08-20 10:49:25 +0100 |
| commit | 1390f9f0db5a5358b3f9993d08792fa265a783df (patch) | |
| tree | c3c99b1e4bc8ca75673f12533867f86662630ae7 | |
| parent | 68f3291bdfe6568fe71169bfb36a3b800fbc8c6e (diff) | |
Remove next button from confirm location screen
Potentially confusing to user that there is a confirm location and a
next button and as they do the same remove the most ambigously titled
one.
Fixes #105
| -rw-r--r-- | src/css/fms.css | 1 | ||||
| -rw-r--r-- | src/js/map-OpenLayers.js | 2 | ||||
| -rw-r--r-- | src/js/views/around.js | 5 | ||||
| -rw-r--r-- | templates/around.html | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/css/fms.css b/src/css/fms.css index 902d925..3c9f678 100644 --- a/src/css/fms.css +++ b/src/css/fms.css @@ -533,7 +533,6 @@ right: 15px; } - #confirm, #confirm-map, #reposition, #view-my-reports, diff --git a/src/js/map-OpenLayers.js b/src/js/map-OpenLayers.js index 938abd0..53d324e 100644 --- a/src/js/map-OpenLayers.js +++ b/src/js/map-OpenLayers.js @@ -405,7 +405,7 @@ OpenLayers.Control.ActionAfterDrag = OpenLayers.Class(OpenLayers.Control, { }, onDragStart: function(evt) { - if ( $('#confirm').css('display') == 'block' ) { + if ( $('#confirm-map').css('display') == 'block' ) { $('#reposition').show(); } } diff --git a/src/js/views/around.js b/src/js/views/around.js index 5f89883..964bef4 100644 --- a/src/js/views/around.js +++ b/src/js/views/around.js @@ -16,7 +16,6 @@ 'blur #pc': 'clearSearchErrors', 'vclick #relocate': 'centerMapOnPosition', 'vclick #cancel': 'onClickCancel', - 'vclick #confirm': 'onClickReport', 'vclick #confirm-map': 'onClickReport', 'vclick #mark-here': 'onClickMark', 'vclick #reposition': 'onClickReposition', @@ -145,7 +144,7 @@ // If we've confirmed the report position then we should be able // to reposition it if we've moved the map. - if ( $('#confirm').css('display') == 'block' ) { + if ( $('#confirm-map').css('display') == 'block' ) { var currentPos = this.projectCoords(FMS.currentPosition); var markerPos = this.getMarkerPosition(true); @@ -196,7 +195,6 @@ } if (isLocationSet) { $('#cancel').addClass('ui-btn-left').show(); - $('#confirm').addClass('ui-btn-right ui-btn-icon-right').show(); $('#confirm-map').show(); $('#view-my-reports').hide(); $('#login-options').hide(); @@ -209,7 +207,6 @@ } } else { $('#cancel').hide().removeClass('ui-btn-left'); - $('#confirm').hide().removeClass('ui-btn-right ui-btn-icon-right'); $('#confirm-map').hide(); $('#view-my-reports').show(); $('#login-options').show(); diff --git a/templates/around.html b/templates/around.html index 38a2f7a..a1db2f0 100644 --- a/templates/around.html +++ b/templates/around.html @@ -5,7 +5,6 @@ <a id="cancel" class="nodisplay" data-role="button" data-icon="arrow-l">[% loc('Cancel') %]</a> <h1>FixMyStreet</h1> <a id="login-options" data-icon="fms-account" class="nodisplay ui-btn-right">[% loc('Account') %]</a> - <a id="confirm" class="nodisplay" data-role="button" data-iconpos="right" data-icon="arrow-r">[% loc('Next') %]</a> </div> <div id="locating" class="nodisplay"> |