From 82f5e9dca9973bf7d1c0078dda1a5b3863b5b6ce Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 1 Aug 2012 12:17:40 +0100
Subject: [PATCH] Move tooltips to where they are less obtrusive.
* Move the "passwords do not match" on the set password screen above the first password.
* Move the "this email address and password do not match" above the email field.
---
resources/static/dialog/views/authenticate.ejs | 7 ++++---
resources/static/dialog/views/set_password.ejs | 7 ++++---
resources/views/signin.ejs | 15 ++++++++-------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/resources/static/dialog/views/authenticate.ejs b/resources/static/dialog/views/authenticate.ejs
index f3c677f0c..285c4f58a 100644
--- a/resources/static/dialog/views/authenticate.ejs
+++ b/resources/static/dialog/views/authenticate.ejs
@@ -25,6 +25,10 @@
<div id="could_not_add" class="tooltip" for="email">
<%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
</div>
+
+ <div id="cannot_authenticate" class="tooltip" for="email">
+ <%= gettext('This email address and password do not match.') %>
+ </div>
</li>
@@ -42,9 +46,6 @@
<%= gettext('The password field is required.') %>
</div>
- <div id="cannot_authenticate" class="tooltip" for="password">
- <%= gettext('This email address and password do not match.') %>
- </div>
</li>
</ul>
diff --git a/resources/static/dialog/views/set_password.ejs b/resources/static/dialog/views/set_password.ejs
index d9bb25f53..74a75f3d1 100644
--- a/resources/static/dialog/views/set_password.ejs
+++ b/resources/static/dialog/views/set_password.ejs
@@ -35,6 +35,10 @@
<div id="could_not_add" class="tooltip" for="password">
<%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
</div>
+
+ <div class="tooltip" id="passwords_no_match" for="password">
+ <%= gettext('These passwords don\'t match!') %>
+ </div>
</li>
<li>
@@ -45,9 +49,6 @@
<%= gettext('Verification password is required.') %>
</div>
- <div class="tooltip" id="passwords_no_match" for="vpassword">
- <%= gettext('These passwords don\'t match!') %>
- </div>
</li>
</ul>
diff --git a/resources/views/signin.ejs b/resources/views/signin.ejs
index a255e7df4..3d4d0a7bd 100644
--- a/resources/views/signin.ejs
+++ b/resources/views/signin.ejs
@@ -39,6 +39,11 @@
<%- gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
</div>
+ <div id="cannot_authenticate" class="tooltip" for="email">
+ <%- gettext('This email address and password do not match.') %>
+ </div>
+
+
</li>
<li class="password_entry vpassword_entry">
@@ -51,14 +56,13 @@
<%- gettext('The password field is required.') %>
</div>
- <div id="cannot_authenticate" class="tooltip" for="password">
- <%- gettext('This email address and password do not match.') %>
- </div>
-
<div class="tooltip" id="password_length" for="password">
<%- gettext('Password must be between 8 and 80 characters long.') %>
</div>
+ <div class="tooltip" id="passwords_no_match" for="password">
+ <%- gettext('These passwords don\'t match!') %>
+ </div>
</li>
<li class="vpassword_entry">
@@ -69,9 +73,6 @@
<%- gettext('Verification password is required.') %>
</div>
- <div class="tooltip" id="passwords_no_match" for="vpassword">
- <%- gettext('These passwords don\'t match!') %>
- </div>
</li>
</ul>
--
GitLab