X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e09b187cae178c000a683635d408cab72dc3d35b..32959aed76917ff14f51acb185484dcc7bb2bfbd:/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..05e9f96c1 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,85 +1,78 @@
-<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>
+<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])) %>
 
-  <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>
-      </table>
+    <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
-    </div>
+    <table id="loginForm">
+      <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %></td></tr>
+      <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :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></td>
+        <td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+          <label for="remember_me">
+            <%= t 'user.login.remember' %></label>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
+        </td>
+      </tr>
+    </table>
+    <p><%= t 'user.login.with openid' %></p>
 
-    <div style="float:left; width: 20px; padding: 10px;">
-    </div>
+    <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 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>
+      <tr id="login_openid_url">
+        <td class="fieldName nowrap">
+          <%= raw t 'user.login.openid', :logo => openid_logo %>
+        </td>
+        <td>
+          <%= url_field_tag("openid_url", "", { :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>
 
-      <table>
-        <tr id="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>
-            <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 %>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %>
-    </div>
-  </div>
-<% end %>
+</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();
+  });
+
+  $(".openid_button").click(function() {
+    $("#openid_url").val($(this).attr("data-url"));
+    $("#login_form").submit();
+  });
 
-<%=
-  update_page_tag do |page|
-    page[:openid_url].hide
-    page[:openid_url_hint].hide
-    page[:openid_submit].hide
-  end
-%>
+  $("#login_openid_url").hide();
+  $("#login_openid_submit").hide();
+});
+</script>