From: Thomas Levine <occurrence@thomaslevine.com>
Date: Mon, 10 Jun 2013 21:01:01 +0000 (-0400)
Subject: Standardize forms between login and new
X-Git-Tag: live~4907
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/26d7f66fbdcd95bdbfebc9c995e206b53dca3ef3?ds=sidebyside

Standardize forms between login and new
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 599cce32d..12a4f2b45 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1229,6 +1229,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the login page */
 
+#login_openid_buttons {
+  height: 56px;
+}
+
 #login_openid_buttons li {
   float: left;
   padding: 5px 10px;
@@ -1434,12 +1438,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .standard-form fieldset {
   margin-bottom: 20px;
-
 }
 
 .standard-form label {
   display: block;
-  width: 200px;
+  width: 300px;
   margin-right: 10px;
   font-size: 14px;
   font-weight: bold;
@@ -1450,6 +1453,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin-bottom: 10px;
 }
 
+.standard-form input[name=remember_me] {
+  float: left;
+}
+
+#remember_me_openid {
+  display: block;
+}
+
 input[type="text"],
 input[type="email"],
 input[type="url"],
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index b13316086..d593672be 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -9,7 +9,7 @@
 
     <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 
-    <div id="loginForm">
+    <div id="loginForm" class="standard-form">
       <fieldset>
         <label><%= t 'user.login.email or username' %></label>
         <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
@@ -17,7 +17,7 @@
       <fieldset>
         <label><%= t 'user.login.password' %></label>
         <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
-        <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span>
+        <p class="form-help deemphasize"><%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %></p>
       </fieldset>
       <fieldset>
         <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
@@ -44,12 +44,11 @@
         <%= url_field_tag("openid_url", "", { :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
         <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
       </fieldset>
-      <fieldset>
+      <fieldset id="remember_me_openid">
         <label for="remember_me"><%= t 'user.login.remember' %></label>
         <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
       </fieldset>
     </div>
-
     <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
   <% end %>