X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/652dbf5044d3f7fdb5f7af1b7e8393c2a79246c6..81bafc6dc2074b9cd12a7d70ae7a5e21651e5910:/app/views/user/login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 0616d76f8..a7927b6e0 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,106 +1,82 @@
-<div id="login_wrapper">
 
-  <div id="login_login">
-    <h1><%= t 'user.login.heading' %></h1>
+<div id="login_login">
+<% content_for :heading do %>
+  <h1><%= t 'user.login.heading' %></h1>
+<% end %>
 
-    <% 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])) %>
 
-      <p><%= t 'user.login.with username' %></p>
+    <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></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 %>
+    <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 %>
+      </fieldset>
+      <fieldset>
+        <label>
+          <%= t 'user.login.password' %>
+        </label>
+        <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
+        <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">
+          <%= 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>
 
-      <br clear="all" />
+    <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>
 
-      <p><%= t 'user.login.with openid' %></p>
+    <div>
+      <fieldset id="login_openid_url">
+        <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 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 %>
 
-      <table id="login_openid_buttons_wide">
-        <tr>
-          <td>
-            <%=
-              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_wide].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>
-        </tr>
-        <tr>
-          <td><%= openid_button "myopenid", "myopenid.com" %></td>
-          <td><%= openid_button "wordpress", "wordpress.com" %></td>
-          <td><%= openid_button "aol", "aol.com" %></td>
-        </tr>
-      </table>
-
-      <table id="login_openid_buttons_narrow">
-        <tr>
-          <td>
-            <%=
-              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_narrow].hide
-                page[:login_openid_url].show
-                page[:login_openid_submit].show
-              end
-            %>
-          </td>
-          <td><%= openid_button "google", "gmail.com" %></td>
-        </tr>
-        <tr>
-          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
-          <td><%= openid_button "myopenid", "myopenid.com" %></td>
-        </tr>
-        <tr>
-          <td><%= openid_button "wordpress", "wordpress.com" %></td>
-          <td><%= openid_button "aol", "aol.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="all" />
-  </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><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+</div>
 
-    <br clear="both">
-  </div>
+<script type="text/javascript">
+$(document).ready(function() {
+  $("#openid_open_url").click(function() {
+    $("#openid_url").val("http://");
+    $("#login_openid_buttons").hide();
+    $("#login_openid_url").show();
+    $("#login_openid_submit").show();
+  });
 
-</div>
+  $(".openid_button").click(function() {
+    $("#openid_url").val($(this).attr("data-url"));
+    $("#login_form").submit();
+  });
 
-<%=
-  update_page_tag do |page|
-    page[:login_openid_url].hide
-    page[:login_openid_submit].hide
-  end
-%>
+  $("#login_openid_url").hide();
+  $("#login_openid_submit").hide();
+});
+</script>