diff --git a/frontend/forgot.html b/frontend/forgot.html index 2717419..5a2659c 100644 --- a/frontend/forgot.html +++ b/frontend/forgot.html @@ -17,16 +17,22 @@
-
- Reset your Password -
-
-
Email Address
- -
-
-
- +
+
+ Reset your Password +
+ +
+
Email Address
+ +
+ +
+
+ + +
+ Suddenly remembered your password? Login.
diff --git a/frontend/js/forgot.js b/frontend/js/forgot.js index 1d9673f..dced2d3 100644 --- a/frontend/js/forgot.js +++ b/frontend/js/forgot.js @@ -4,7 +4,9 @@ (document); // Talks to the API and sends an reset email. - global.sendResetHex = function() { + global.sendResetHex = function(event) { + event.preventDefault(); + var allOk = global.unfilledMark(["#email"], function(el) { el.css("border-bottom", "1px solid red"); }); diff --git a/frontend/js/login.js b/frontend/js/login.js index 9b3859d..18dc355 100644 --- a/frontend/js/login.js +++ b/frontend/js/login.js @@ -43,7 +43,9 @@ // Logs the user in and redirects to the dashboard. - global.login = function() { + global.login = function(event) { + event.preventDefault(); + var allOk = global.unfilledMark(["#email", "#password"], function(el) { el.css("border-bottom", "1px solid red"); }); diff --git a/frontend/js/reset.js b/frontend/js/reset.js index 8ca3998..717b0db 100644 --- a/frontend/js/reset.js +++ b/frontend/js/reset.js @@ -1,7 +1,9 @@ (function (global, document) { "use strict"; - global.resetPassword = function() { + global.resetPassword = function(event) { + event.preventDefault(); + var allOk = global.unfilledMark(["#password", "#password2"], function(el) { el.css("border-bottom", "1px solid red"); }); diff --git a/frontend/js/signup.js b/frontend/js/signup.js index 857cdc3..f8fbbe1 100644 --- a/frontend/js/signup.js +++ b/frontend/js/signup.js @@ -4,7 +4,9 @@ // Signs up the user and redirects to either the login page or the email // confirmation, depending on whether or not SMTP is configured in the // backend. - global.signup = function() { + global.signup = function(event) { + event.preventDefault(); + if ($("#password").val() !== $("#password2").val()) { global.textSet("#err", "The two passwords don't match"); return; diff --git a/frontend/login.html b/frontend/login.html index 4b3addd..862cc0c 100644 --- a/frontend/login.html +++ b/frontend/login.html @@ -25,24 +25,26 @@
-
- Login to continue -
+
+
+ Login to continue +
-
-
Email Address
- -
+
+
Email Address
+ +
-
-
Password
- -
+
+
Password
+ +
-
-
+
+
- + +
Trouble logging in? Reset your password. Don't have an account yet? Sign up. diff --git a/frontend/reset-password.html b/frontend/reset-password.html index e6c507c..838ab3a 100644 --- a/frontend/reset-password.html +++ b/frontend/reset-password.html @@ -17,23 +17,25 @@
-
- Reset your Password -
+
+
+ Reset your Password +
-
-
New Password
- -
+
+
New Password
+ +
-
-
Confirm Password
- -
+
+
Confirm Password
+ +
-
-
- +
+
+ +
diff --git a/frontend/signup.html b/frontend/signup.html index 075297c..4c18bda 100644 --- a/frontend/signup.html +++ b/frontend/signup.html @@ -24,38 +24,40 @@
-
- Create an account -
+
+
+ Create an account +
-
-
Email Address
- -
+
+
Email Address
+ +
-
-
Full Name
- -
+
+
Full Name
+ +
-
-
Password
- -
+
+
Password
+ +
-
-
Confirm Password
- -
+
+
Confirm Password
+ +
- + -
+
-

-

+

+

- + +
Already have an account? Login instead.