X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..c70a1fe9334cf8978ae254d712a8e445e2fa1996:/app/views/user/login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 051d270a4..3d28a770a 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,8 +1,12 @@
-<div id="login_login">
+<% content_for :head do %>
+  <%= javascript_include_tag "login" %>
+<% end %>
+
 <% content_for :heading do %>
   <h1><%= t 'user.login.heading' %></h1>
 <% end %>
 
+<div id="login_login">
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag('referer', h(params[:referer])) %>
 
@@ -12,13 +16,13 @@
 
       <fieldset>
         <div class="form-row">
-          <label class="standard-label">
+          <label for="username" class="standard-label">
             <%= t 'user.login.email or username' %>
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">
-          <label class="standard-label">
+          <label for="password" class="standard-label">
             <%= t 'user.login.password' %>
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
@@ -29,7 +33,7 @@
       </fieldset>
 
       <fieldset>
-        <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+        <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
         <label for="remember_me" class="standard-label">
           <%= t 'user.login.remember' %>
         </label>
@@ -38,26 +42,37 @@
 
       <fieldset class='form-divider'>
 
-        <p class='standard-label'><%= t 'user.login.with openid' %></p>
-
-        <ul class='clearfix' 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 "wordpress", "wordpress.com" %></li>
-          <li><%= openid_button "aol", "aol.com" %></li>
+        <p class='standard-label'><%= t 'user.login.with external' %></p>
+
+        <ul class='clearfix' id="login_auth_buttons">
+          <li><%= link_to image_tag("openid.png", :alt => t("user.login.auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.auth_providers.openid.title") %></li>
+          <% if defined?(GOOGLE_AUTH_ID) -%>
+          <li><%= auth_button "google", "google" %></li>
+          <% end -%>
+          <% if defined?(FACEBOOK_AUTH_ID) -%>
+          <li><%= auth_button "facebook", "facebook" %></li>
+          <% end -%>
+          <% if defined?(WINDOWSLIVE_AUTH_ID) -%>
+          <li><%= auth_button "windowslive", "windowslive" %></li>
+          <% end -%>
+          <% if defined?(GITHUB_AUTH_ID) -%>
+          <li><%= auth_button "github", "github" %></li>
+          <% end -%>
+          <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
+          <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
+          <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
         </ul>
 
-          <div id='login_openid_url' class='form-row'>
-            <label class="standard-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>
-          </div>
+        <div id='login_openid_url' class='form-row'>
+          <label for='openid_url' class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
+          <%= text_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>
+        </div>
 
-          <div id="remember_me_openid" class='form-row'>
-            <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
-            <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>
-          </div>
+        <div class='form-row'>
+          <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
+          <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>
+        </div>
 
         <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
 
@@ -68,27 +83,3 @@
   <% end %>
 
 </div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-  // Preserve location hash in referer
-  if (window.location.hash) {
-    $('#referer').val($('#referer').val() + window.location.hash);
-  }
-
-  $("#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();
-  });
-
-  $("#login_openid_url").hide();
-  $("#login_openid_submit").hide();
-});
-</script>