aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/js/strings.js4
-rw-r--r--www/js/views/around.js19
-rw-r--r--www/js/views/details.js4
-rw-r--r--www/js/views/existing.js6
-rw-r--r--www/js/views/fms.js4
-rw-r--r--www/js/views/login.js15
-rw-r--r--www/js/views/offline.js12
-rw-r--r--www/js/views/photo.js10
-rw-r--r--www/js/views/reports.js8
-rw-r--r--www/js/views/save_offline.js4
-rw-r--r--www/js/views/search.js13
-rw-r--r--www/js/views/submit.js32
-rw-r--r--www/templates/en/around.html8
-rw-r--r--www/templates/en/login.html2
-rw-r--r--www/templates/en/submit_email.html13
15 files changed, 87 insertions, 67 deletions
diff --git a/www/js/strings.js b/www/js/strings.js
index 13b149f..08e2cd0 100644
--- a/www/js/strings.js
+++ b/www/js/strings.js
@@ -20,7 +20,9 @@
password: 'Please enter a password'
},
strings: {
- login_error: 'There was a problem logging you in. Please check your email and password',
+ login_error: 'There was a problem logging you in. Please try later',
+ logout_error: 'There was a problem logging you out. Please try later',
+ login_details_error: 'There was a problem logging you in. Please check your email and password',
location_error: 'Location error',
location_problem: 'There was a problem looking up your location',
multiple_locations: 'More than one location matched that name',
diff --git a/www/js/views/around.js b/www/js/views/around.js
index ffc712f..d1075f6 100644
--- a/www/js/views/around.js
+++ b/www/js/views/around.js
@@ -8,14 +8,14 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click #locate_search': 'goSearch',
- 'click #login-options': 'goLogin',
- 'click #view-my-reports': 'goReports',
- 'click #search': 'goSearch',
- 'click #relocate': 'centerMapOnPosition',
- 'click #cancel': 'onClickCancel',
- 'click #confirm': 'onClickReport',
- 'click #mark-here': 'onClickMark'
+ 'vclick #locate_search': 'goSearch',
+ 'vclick #login-options': 'goLogin',
+ 'vclick #view-my-reports': 'goReports',
+ 'vclick #search': 'goSearch',
+ 'vclick #relocate': 'centerMapOnPosition',
+ 'vclick #cancel': 'onClickCancel',
+ 'vclick #confirm': 'onClickReport',
+ 'vclick #mark-here': 'onClickMark'
},
render: function(){
@@ -147,7 +147,8 @@
}
},
- onClickMark: function() {
+ onClickMark: function(e) {
+ e.preventDefault();
$('#cancel').show();
$('#confirm').show();
$('#view-my-reports').hide();
diff --git a/www/js/views/details.js b/www/js/views/details.js
index 17f8d68..67fbab6 100644
--- a/www/js/views/details.js
+++ b/www/js/views/details.js
@@ -10,8 +10,8 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext',
'blur textarea': 'updateCurrentReport',
'change select': 'updateSelect',
'blur input': 'updateCurrentReport'
diff --git a/www/js/views/existing.js b/www/js/views/existing.js
index 7487419..4f761fd 100644
--- a/www/js/views/existing.js
+++ b/www/js/views/existing.js
@@ -8,9 +8,9 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click #use_report': 'useReport',
- 'click #save_report': 'saveReport',
- 'click #discard': 'discardReport'
+ 'vclick #use_report': 'useReport',
+ 'vclick #save_report': 'saveReport',
+ 'vclick #discard': 'discardReport'
},
useReport: function() {
diff --git a/www/js/views/fms.js b/www/js/views/fms.js
index f78e1aa..7196941 100644
--- a/www/js/views/fms.js
+++ b/www/js/views/fms.js
@@ -7,8 +7,8 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext'
},
render: function(){
diff --git a/www/js/views/login.js b/www/js/views/login.js
index 9f3d197..ef3ac06 100644
--- a/www/js/views/login.js
+++ b/www/js/views/login.js
@@ -9,11 +9,11 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click #login': 'onClickLogin',
+ 'vclick #login': 'onClickLogin',
'submit #signinForm': 'onClickLogin',
- 'click #logout': 'onClickLogout',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext'
+ 'vclick #logout': 'onClickLogout',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext'
},
onClickLogin: function(e) {
@@ -43,11 +43,11 @@
$('#logout').focus();
} else {
$('#login').focus();
- that.validationError('form_email', FMS.strings.login_error);
+ that.validationError('form_email', FMS.strings.login_details_error);
}
},
error: function() {
- alert('boo :(');
+ that.validationError('form_email', FMS.strings.login_error);
}
} );
}
@@ -71,8 +71,7 @@
that.$('#password_row').show();
},
error: function() {
- // TODO fix this
- alert( 'There was a problem signing you out');
+ that.validationError('err', FMS.strings.logout_error);
}
} );
},
diff --git a/www/js/views/offline.js b/www/js/views/offline.js
index d785d39..b1168e6 100644
--- a/www/js/views/offline.js
+++ b/www/js/views/offline.js
@@ -11,12 +11,12 @@
'pagehide': 'destroy',
'pagebeforeshow': 'toggleNextButton',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext',
- 'click #id_photo_button': 'takePhoto',
- 'click #id_existing': 'addPhoto',
- 'click #id_del_photo_button': 'deletePhoto',
- 'click #locate': 'locate',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext',
+ 'vclick #id_photo_button': 'takePhoto',
+ 'vclick #id_existing': 'addPhoto',
+ 'vclick #id_del_photo_button': 'deletePhoto',
+ 'vclick #locate': 'locate',
'blur input': 'toggleNextButton',
'blur textarea': 'toggleNextButton'
},
diff --git a/www/js/views/photo.js b/www/js/views/photo.js
index fb1eb68..041d573 100644
--- a/www/js/views/photo.js
+++ b/www/js/views/photo.js
@@ -10,11 +10,11 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext',
- 'click #id_photo_button': 'takePhoto',
- 'click #id_existing': 'addPhoto',
- 'click #id_del_photo_button': 'deletePhoto'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext',
+ 'vclick #id_photo_button': 'takePhoto',
+ 'vclick #id_existing': 'addPhoto',
+ 'vclick #id_del_photo_button': 'deletePhoto'
},
beforeDisplay: function() {
diff --git a/www/js/views/reports.js b/www/js/views/reports.js
index 2704dd1..5241319 100644
--- a/www/js/views/reports.js
+++ b/www/js/views/reports.js
@@ -9,10 +9,10 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .del_report': 'deleteReport',
- 'click .use_report': 'useReport',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext'
+ 'vclick .del_report': 'deleteReport',
+ 'vclick .use_report': 'useReport',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext'
},
deleteReport: function(e) {
diff --git a/www/js/views/save_offline.js b/www/js/views/save_offline.js
index 875fe42..e9cedc8 100644
--- a/www/js/views/save_offline.js
+++ b/www/js/views/save_offline.js
@@ -7,8 +7,8 @@
events: {
'pagehide': 'destroy',
'pageshow': 'afterDisplay',
- 'click #save_report': 'saveReport',
- 'click #discard': 'discardReport'
+ 'vclick #save_report': 'saveReport',
+ 'vclick #discard': 'discardReport'
},
saveReport: function() {
diff --git a/www/js/views/search.js b/www/js/views/search.js
index 0cf1de2..9e0a4ca 100644
--- a/www/js/views/search.js
+++ b/www/js/views/search.js
@@ -5,9 +5,9 @@
id: 'search-page',
events: {
- 'click a.address': 'goAddress',
- 'click #submit': 'search',
- 'click #locate': 'goLocate',
+ 'vclick a.address': 'goAddress',
+ 'vclick #submit': 'search',
+ 'vclick #locate': 'goLocate',
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
@@ -23,6 +23,7 @@
search: function(e) {
// this is to stop form submission
e.preventDefault();
+ this.clearValidationErrors();
var pc = this.$('#pc').val();
this.listenTo(FMS.locator, 'search_located', this.searchSuccess );
this.listenTo(FMS.locator, 'search_failed', this.searchFail);
@@ -51,7 +52,7 @@
$('#submit').focus();
this.stopListening(FMS.locator);
if ( details.msg ) {
- this.displayError( details.msg );
+ this.validationError( 'pc', details.msg );
} else if ( details.locations ) {
var multiple = '';
for ( var i = 0; i < details.locations.length; i++ ) {
@@ -59,9 +60,9 @@
var li = '<li><a class="address" id="location_' + i + '" data-lat="' + loc.lat + '" data-long="' + loc.long + '">' + loc.address + '</a></li>';
multiple = multiple + li;
}
- $('#front-howto').html('<ul>' + multiple + '</ul>');
+ $('#front-howto').html('<p>Multiple matches found</p><ul>' + multiple + '</ul>');
} else {
- this.displayError( FMS.strings.location_problem );
+ this.validationError( 'pc', FMS.strings.location_problem );
}
},
diff --git a/www/js/views/submit.js b/www/js/views/submit.js
index e385359..bab9396 100644
--- a/www/js/views/submit.js
+++ b/www/js/views/submit.js
@@ -9,11 +9,11 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click .ui-btn-right': 'onClickButtonNext',
- 'click #submit_signed_in': 'onClickSubmit',
- 'click #submit_sign_in': 'onClickSubmit',
- 'click #submit_register': 'onClickSubmit'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick .ui-btn-right': 'onClickButtonNext',
+ 'vclick #submit_signed_in': 'onClickSubmit',
+ 'vclick #submit_sign_in': 'onClickSubmit',
+ 'vclick #submit_register': 'onClickSubmit'
},
render: function(){
@@ -93,9 +93,9 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click #have_password': 'onClickPassword',
- 'click #email_confirm': 'onClickConfirm'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #have_password': 'onClickPassword',
+ 'vclick #email_confirm': 'onClickConfirm'
},
validate: function() {
@@ -145,9 +145,9 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click #send_confirm': 'onClickSubmit',
- 'click #set_password': 'onClickPassword'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #send_confirm': 'onClickSubmit',
+ 'vclick #set_password': 'onClickPassword'
},
initialize: function() {
@@ -204,9 +204,9 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click #report': 'onClickSubmit',
- 'click #confirm_name': 'onClickSubmit',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #report': 'onClickSubmit',
+ 'vclick #confirm_name': 'onClickSubmit',
'submit #passwordForm': 'onClickSubmit'
},
@@ -274,8 +274,8 @@
'pagehide': 'destroy',
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
- 'click .ui-btn-left': 'onClickButtonPrev',
- 'click #report': 'onClickSubmit'
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #report': 'onClickSubmit'
},
validate: function() {
diff --git a/www/templates/en/around.html b/www/templates/en/around.html
index b597d9c..b7fda3f 100644
--- a/www/templates/en/around.html
+++ b/www/templates/en/around.html
@@ -45,9 +45,6 @@
};
</script>
- <div id="map_box" class="mapbox">
- <div id="map"></div>
- </div>
<div class="frontpage-menu">
<a id="view-my-reports" class="nodisplay" data-role="button" href="#">
<strong>My Reports</strong>
@@ -63,6 +60,11 @@
<strong class="signin">Sign In</strong>
</a>
<% } %>
+ </div>
+
+
+ <div id="map_box" class="mapbox">
+ <div id="map"></div>
<a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn nodisplay">
New Report Here
diff --git a/www/templates/en/login.html b/www/templates/en/login.html
index 69aa630..02733da 100644
--- a/www/templates/en/login.html
+++ b/www/templates/en/login.html
@@ -7,6 +7,7 @@
<% if ( FMS.isLoggedIn ) { %>
<div id="signed_in_row">
<p>You are signed in as <%= email %></p>
+ <div id="err" class="nodisplay"></div>
<input type="button" id="logout" name="logout" value="Sign Out" data-theme="a">
</div>
<div id="password_row" class="nodisplay">
@@ -30,6 +31,7 @@
<p>
Signed in!
</p>
+ <div id="err" class="nodisplay"></div>
<input type="button" id="logout" name="logout" value="Sign Out" data-theme="a">
</div>
</div>
diff --git a/www/templates/en/submit_email.html b/www/templates/en/submit_email.html
index 641e276..6de8a21 100644
--- a/www/templates/en/submit_email.html
+++ b/www/templates/en/submit_email.html
@@ -10,4 +10,17 @@
</div>
<input data-role="button" data-theme="a" type="button" id="have_password" name="have_password" value="I have a password">
<input data-role="button" data-theme="a" type="button" id="email_confirm" name="email_confirm" value="I don't">
+
+ <p>
+ To make a report on FixMyStreet we require you to confirm your email address either by setting up
+ an account, or clicking a link in an email we send you.
+ </p>
+
+ <p>
+ If you have a FixMyStreet account then choose "I have a password", otherwise choose "I don't".
+ </p>
+
+ <p>
+ If you choose "I don't" then you can, if you want, set a password.
+ </p>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-23 06:37:57 +0000