Fine tune login form

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index cd00f7eabfce7b25741c41112815046293390732..3fb643f3c583897a80fa5cc2091d7532898f6b75 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1220,7 +1220,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the login page */
 
 #login_openid_buttons {
-  height: 56px;
+  margin-bottom: 0;
 }
 
 #login_openid_buttons li {
@@ -1424,7 +1424,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .standard-form {
   fieldset {
-    margin-bottom: $lineheight/2;
+    margin-bottom: $lineheight;
   }
   label {
     display: block;
@@ -1434,10 +1434,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     font-weight: bold;
     line-height: 1.5;
   }
+  .form-section {
+    margin-top: $lineheight;
+    padding-top: $lineheight;
+    border-top: 1px solid $keyline;
+  }
   .form-row {
     margin-bottom: $lineheight/2;
   }
-  input[name=remember_me] {
+  input[name=remember_me],
+  input[name=remember_me_openid] {
     float: left;
   }
 }
@@ -1453,6 +1459,7 @@ input[type="password"],
 textarea {
   border: 1px solid #ccc;
   padding: 2px 5px;
+  margin: 0;
 }
 
 textarea {

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index b5f93dcfb402010f6a0877837bcb760a9869d7ba..d8a63bde63e8c9d98922043504d3864adb643b79 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -15,7 +15,7 @@
 
   <fieldset class="form-row">
     <label class="standard-label"><%= t 'user.account.current email address' %></label>
-    <input type="email" size="30" disabled value="<%= @user.email %>" />
+    <input type="email" disabled value="<%= @user.email %>" />
     <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
   </fieldset>
 

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index f03292fe99ae858f442d189263b230ff428cb0fc..d1efa8b2b0e0dae9818a51cb76f66c2a85580818 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -7,57 +7,66 @@
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag('referer', h(params[:referer])) %>
 
-    <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+    <p class='deemphasize'><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 
     <div id="loginForm" class="standard-form">
+
       <fieldset>
-        <label class="standard-label">
-          <%= t 'user.login.email or username' %>
-        </label>
-        <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
-      </fieldset>
-      <fieldset>
-        <label class="standard-label">
-          <%= t 'user.login.password' %>
-        </label>
-        <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
+        <div class="form-row">
+          <label class="standard-label">
+            <%= t 'user.login.email or username' %>
+          </label>
+          <%= text_field_tag "username", params[:username], :tabindex => 1 %>
+        </div>
+        <div class="form-row">
+          <label class="standard-label">
+            <%= t 'user.login.password' %>
+          </label>
+          <%= password_field_tag "password", "", :tabindex => 2 %>
+        </div>
         <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 %>
         <label for="remember_me" class="standard-label">
           <%= t 'user.login.remember' %>
         </label>
-      </fieldset>
-      <fieldset>
         <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
       </fieldset>
-    </div>
-    <p><%= t 'user.login.with openid' %></p>
-
-    <ul id="login_openid_buttons">
-        <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
-        <li><%= openid_button "google", "gmail.com" %></li>
-        <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
-        <li><%= openid_button "myopenid", "myopenid.com" %></li>
-        <li><%= openid_button "wordpress", "wordpress.com" %></li>
-        <li><%= openid_button "aol", "aol.com" %></li>
-    </ul>
-
-    <div>
-      <fieldset id="login_openid_url">
-        <label class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
-        <%= url_field_tag("openid_url", "", { :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 id="remember_me_openid">
-        <label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
-        <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
+
+      <fieldset class='form-section'>
+
+        <p class='standard-label'><%= t 'user.login.with openid' %></p>
+
+        <ul class='clearfix' id="login_openid_buttons">
+          <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
+          <li><%= openid_button "google", "gmail.com" %></li>
+          <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
+          <li><%= openid_button "myopenid", "myopenid.com" %></li>
+          <li><%= openid_button "wordpress", "wordpress.com" %></li>
+          <li><%= openid_button "aol", "aol.com" %></li>
+        </ul>
+
+          <div id='login_openid_url' class='form-row'>
+            <label class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
+            <%= url_field_tag("openid_url", "", { :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>
+          </div>
+
+          <div id="remember_me_openid" class='form-row'>
+            <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
+            <label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
+          </div>
+
+        <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+
       </fieldset>
+
     </div>
-    <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+
   <% end %>
 
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9ea7412c6fa37781631487fb4dc7e03a030572b..f6abe2998afe375211819465d531cf5c685b2519 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1613,7 +1613,7 @@ en:
       login_button: "Login"
       register now: Register now
       with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with openid: "Alternatively please use your OpenID to login:"
+      with openid: "Alternatively, use OpenID to login:"
       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.