X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c016bf6c153eb1c416b2104874bf2e44c2f55913..49a45b1c52b9cc8bbfcd6f4e6c93adac912d95a1:/app/views/user/login.html.erb?ds=sidebyside

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 72c768713..8c079d0f1 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,67 +1,51 @@
-<h1><%= t 'user.login.heading' %></h1>
+<div id="login_wrapper">
 
-<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
+  <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])) %>
+    <%= 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>
-        <tr>
-          <td class="fieldName"><label for="user_email"><%= t 'user.login.email or username' %></label></td>
-          <td><%= text_field_tag("username", "", { :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_tag("password", "", { :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>
+      <p><%= t 'user.login.with username' %></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>
       </table>
+      <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
-    </div>
+      <br clear="all" />
 
-    <div style="float:left; width: 20px; padding: 10px;">
-    </div>
+      <p><%= t 'user.login.with openid' %></p>
 
-    <div class="loginBox">
-      <h3><%= t 'user.login.openid_heading' %></h3>
-      <div id="openid_buttons">
-        <%=
-          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[:openid_buttons].hide
-            page[:openid_url].show
-            page[:openid_url_hint].show
-            page[:openid_submit].show
-          end
-        %>
-        <%= openid_button "yahoo", "me.yahoo.com" %>
-        <%= openid_button "google", "gmail.com" %>
-        <%= openid_button "myopenid", "myopenid.com" %>
-        <%= openid_button "wordpress", "wordpress.com" %>
-        <%= openid_button "myspace", "myspace.com" %>
-      </div>
+      <table id="login_openid_buttons">
+        <tr>
+          <td>
+            <%=
+              link_to_function(image_tag("openid.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
+            %>
+          </td>
+          <td><%= openid_button "google", "gmail.com" %></td>
+          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
+          <td><%= openid_button "myopenid", "myopenid.com" %></td>
+          <td><%= openid_button "wordpress", "wordpress.com" %></td>
+          <td><%= openid_button "aol", "aol.com" %></td>
+        </tr>
+      </table>
 
       <table>
-        <tr id="openid_url">
+        <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" }) %></td>
-        </tr>
-        <tr id="openid_url_hint">
-          <td></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>
@@ -71,15 +55,26 @@
         </tr>
       </table>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %>
-    </div>
+      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+    <% end %>
+
+    <br clear="all" />
   </div>
-<% end %>
+
+  <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>
 
 <%=
   update_page_tag do |page|
-    page[:openid_url].hide
-    page[:openid_url_hint].hide
-    page[:openid_submit].hide
+    page[:login_openid_url].hide
+    page[:login_openid_submit].hide
   end
 %>