From: Tom MacWright <tom@macwright.org>
Date: Sun, 26 Feb 2012 23:47:49 +0000 (-0500)
Subject: Simplify login page
X-Git-Tag: live~5768
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7b6d0f031375284f3404e02cab09a541377c6d14

Simplify login page

Moves action buttons to be with the form instead of way over on
the opposite side of the page.

Reorganizes "remember me" to a more typical spot on the page.

Get rid of separate "create account" panel and replace it with an
above the fold link.
---

diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index 61fbf4104..8ca91bf37 100644
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -194,12 +194,6 @@ html body {
   float: right;
 }
 
-/* Rules for the login page */
-
-#login_wrapper input[type=submit] {
-  float: right;
-}
-
 /* Rules for the account confirmation page */
 
 form#termsForm div#buttons {
diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index d616feda6..669889ce9 100644
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -194,12 +194,6 @@ html body {
   float: left;
 }
 
-/* Rules for the login page */
-
-#login_wrapper input[type=submit] {
-  float: left;
-}
-
 /* Rules for the account confirmation page */
 
 form#termsForm div#buttons {
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index dc330feae..c185a11b7 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -6,14 +6,25 @@
     <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
       <%= hidden_field_tag('referer', h(params[:referer])) %>
 
-      <p><%= t 'user.login.with username' %></p>
+      <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 
       <table id="loginForm">
         <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
         <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
-        <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td></tr>
+        <tr>
+          <td></td>
+          <td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+            <label for="remember_me">
+              <%= t 'user.login.remember' %></label>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>
+            <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
+          </td>
+        </tr>
       </table>
-      <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
 
       <br clear="all" />
 
@@ -51,16 +62,6 @@
 
     <br clear="all" />
   </div>
-
-  <div id="login_signup">
-    <h2><%= t 'user.login.new to osm' %></h2>
-    <p><%= t 'user.login.to make changes' %></p>
-    <p><%= t 'user.login.create account minute' %></p>
-    <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
-
-    <br clear="both">
-  </div>
-
 </div>
 
 <script type="text/javascript">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc8bb05ac..6441bb860 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1555,7 +1555,7 @@ en:
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "%{logo} OpenID:"
-      remember: "Remember me:"
+      remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now
@@ -1564,6 +1564,7 @@ en:
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."