From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 May 2010 14:33:35 +0000 (+0100)
Subject: Rework the login page to make it a bit cleaner
X-Git-Tag: live~6333
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/59a6b1973b92c91c987496410427d9a3be76e7e6?ds=sidebyside

Rework the login page to make it a bit cleaner
---

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index eb2b34e90..006a3d32f 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -3,7 +3,7 @@ module UserHelper
     link_to_function(
       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
       nil,
-      :title => t("user.login.openid_providers.#{name}.title")      
+      :title => t("user.login.openid_providers.#{name}.title")
     ) do |page|
       page[:login_form][:user_openid_url][:value] = url
       page[:login_form].submit()
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 31379e03e..37b852a52 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -3,54 +3,84 @@
 <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
 
 <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
-    <%= hidden_field_tag('referer', h(params[:referer])) %>
-    <div style="position: relative;">
-        <div class="loginBox">
-            <h3> <%= t 'user.login.username_heading' %></h3>
-            <table id="loginForm" width="100%">
-                <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
-                <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %></td></tr>
-                <tr><td></td><td> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
-            </table>
-        </div>
-        <div style="float:left; width: 20px; padding: 10px;">
-        </div>
-
-        <div class="loginBox">
-            <h3><%= t 'user.login.openid_heading' %></h3>
-            <table id="loginForm" width="100%">
-                <tr>
-                    <td class="fieldName">
-                        <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %>
-                        <%= t 'user.login.openid' %>
-                    </td>
-                    <td><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url"}) %></td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>
-                        <span class="minorNote">
-                            (<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)
-                        </span>
-                    </td>
-                </tr>
-            </table>
-            <%=
-              link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
-                page[:login_form][:user_openid_url][:value] = "http://"
-              end
-            %>
-            <%= openid_button "yahoo", "yahoo.com" %>
-            <%= openid_button "google", "gmail.com" %>
-            <%= openid_button "myopenid", "myopenid.com" %>
-            <%= openid_button "wordpress", "wordpress.com" %>
-            <%= openid_button "myspace", "myspace.com" %>
-        </div>
-
-        <div style="clear: both">
-            <table id="loginForm">
-                <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><td align=right><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
-            </table>
-        </div>
+  <%= hidden_field_tag('referer', h(params[:referer])) %>
+
+  <div style="position: relative;">
+    <div class="loginBox">
+      <h3><%= t 'user.login.username_heading' %></h3>
+      <table>
+        <tr>
+          <td class="fieldName"><label for="user_email"><%= t 'user.login.email or username' %></label></td>
+          <td><%= text_field(:user, :email, { :value => "", :size => 28, :maxlength => 255, :tabindex => 1 }) %></td>
+        </tr>
+        <tr>
+          <td class="fieldName"><label for="user_password"><%= t 'user.login.password' %></label></td>
+          <td><%= password_field(:user, :password, { :value => "", :size => 28, :maxlength => 255, :tabindex => 2 }) %></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td><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>
+      </table>
+
+      <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
     </div>
+
+    <div style="float:left; width: 20px; padding: 10px;">
+    </div>
+
+    <div class="loginBox">
+      <h3><%= t 'user.login.openid_heading' %></h3>
+      <div id="openid_buttons">
+        <%=
+          link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
+            page[:login_form][:user_openid_url].value = "http://"
+            page[:openid_buttons].hide
+            page[:openid_url].show
+            page[:openid_url_hint].show
+            page[:openid_submit].show
+          end
+        %>
+        <%= openid_button "yahoo", "yahoo.com" %>
+        <%= openid_button "google", "gmail.com" %>
+        <%= openid_button "myopenid", "myopenid.com" %>
+        <%= openid_button "wordpress", "wordpress.com" %>
+        <%= openid_button "myspace", "myspace.com" %>
+      </div>
+
+      <table>
+        <tr id="openid_url">
+          <td class="fieldName">
+            <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %>
+            <%= t 'user.login.openid' %>
+          </td>
+          <td><%= text_field(:user, :openid_url, { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %></td>
+        </tr>
+        <tr id="openid_url_hint">
+          <td></td>
+          <td>
+            <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="fieldName nowrap"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
+          <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
+        </tr>
+      </table>
+
+      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %>
+    </div>
+  </div>
 <% end %>
+
+<%=
+  update_page_tag do |page|
+    page[:openid_url].hide
+    page[:openid_url_hint].hide
+    page[:openid_submit].hide
+  end
+%>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c61cf928b..f7b145754 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -583,6 +583,41 @@ hr {
   margin-top: 10px;
 }
 
+/* Rules for the login form */
+
+.loginBox {
+  float: left;
+  border-style: solid;
+  border-width: 1px;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-bottom: 10px;
+}
+
+.loginBox table {
+  width: 100%;
+}
+
+.loginBox .fieldName img {
+  vertical-align: text-bottom;
+}
+
+.loginBox img {
+  border: 0;
+}
+
+.loginBox #openid_buttons img {
+  vertical-align: middle;
+}
+
+.loginBox input[type="submit"] {
+  float: right;
+}
+
+#openid_buttons {
+  margin-bottom: 20px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {
@@ -718,6 +753,11 @@ input[type="submit"] {
   border: 1px solid black;
 }
 
+input.openid_url { 
+  background: url('../images/openid-inputicon.gif') repeat-y left;
+  padding-left: 16px;
+}
+
 /* Rules for user images */
 
 img.user_image {
@@ -760,24 +800,3 @@ abbr.geo {
 .table1 { 
   background: #fff;
 }
-
-input.openid_url { 
-  background: url('../images/openid-inputicon.gif') repeat-y left;
-  padding-left: 16px;
-}
-
-/* Rules for Login page */
-.loginBox {
-  float: left;
-  width: 400px;
-  height: 200px;
-  margin-bottom: 40px;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-.loginBox img {
-  border: 0;
-}
diff --git a/public/stylesheets/large.css b/public/stylesheets/large.css
index a1efa8583..458099add 100644
--- a/public/stylesheets/large.css
+++ b/public/stylesheets/large.css
@@ -18,3 +18,11 @@
 .olControlPanZoom {
   display: none;
 }
+
+/* Rules for the login form */
+
+.loginBox {
+  width: 400px;
+  height: 200px;
+  margin-bottom: 40px;
+}
diff --git a/public/stylesheets/small.css b/public/stylesheets/small.css
index 82a93544b..c709bcba9 100644
--- a/public/stylesheets/small.css
+++ b/public/stylesheets/small.css
@@ -100,27 +100,21 @@ h1 {
 
 /* Rules for the login form */
 
-#loginForm input#user_email {
+.loginBox {
+  width: 90%;
+}
+
+.loginBox input#user_email {
   width: 100%;
   max-width: 18em;
 }
 
-#loginForm input#user_password {
+.loginBox input#user_password {
   width: 100%;
   max-width: 18em;
 }
 
-#loginForm input#user_openid_url {
+.loginBox input#user_openid_url {
   width: 100%;
   max-width: 18em;
 }
-
-/* Rules for Login page */
-.loginBox {
-  float: left;
-  width: 90%;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
\ No newline at end of file