X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/48d450060b3b5c19bb1fa8e85341d76177de26d2..9cb8311f02e1bd0e2188e3b1db623400aaf8da47:/app/views/user/login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 31379e03e..4515f412d 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,56 +1,80 @@
-<h1><%= t 'user.login.heading' %></h1>
-
-<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>
+<div id="login_wrapper">
+
+  <div id="login_login">
+    <h1><%= t 'user.login.heading' %></h1>
+
+    <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+      <%= hidden_field_tag('referer', h(params[:referer])) %>
+
+      <p><%= t 'user.login.with username' %></p>
+
+      <table id="loginForm">
+        <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}) %> <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 => 3 %>
+
+      <p><%= t 'user.login.with openid' %></p>
+
+      <table id="login_openid_buttons">
+        <tr>
+          <td>
             <%=
-              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://"
+              link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
+                page[:login_form][:openid_url].value = "http://"
+                page[:login_openid_buttons].hide
+                page[:login_openid_url].show
+                page[:login_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>
-
-        <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>
-    </div>
-<% end %>
+          </td>
+          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
+          <td><%= openid_button "google", "gmail.com" %></td>
+        </tr>
+        <tr>
+          <td><%= openid_button "myopenid", "myopenid.com" %></td>
+          <td><%= openid_button "wordpress", "wordpress.com" %></td>
+          <td><%= openid_button "myspace", "myspace.com" %></td>
+        </tr>
+      </table>
+
+      <table>
+        <tr id="login_openid_url">
+          <td class="fieldName nowrap">
+            <%= t 'user.login.openid', :logo => openid_logo %>
+          </td>
+          <td>
+            <%= text_field_tag("openid_url", "", { :size => 28, :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>
+          </td>
+        </tr>
+        <tr>
+          <td class="fieldName nowrap" id="remember_me_label"><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 => "login_openid_submit" %>
+    <% end %>
+
+    <br clear="both">
+  </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>
+    <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+
+    <br clear="both">
+  </div>
+
+</div>
+
+<%=
+  update_page_tag do |page|
+    page[:login_openid_url].hide
+    page[:login_openid_submit].hide
+  end
+%>