Merge remote-tracking branch 'upstream/pull/1809'

[rails.git] / app / views / user / login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 0f193e896da5256918a499e1a99da8f37eb64ee0..21705e358644634d6d3a30d2ac9c23821b5ef2ff 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,65 +1,83 @@
-<div id="login_login">
+<% content_for :head do %>
+  <%= javascript_include_tag "login" %>
+<% end %>
+

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'user.login.heading' %></h1>
+  <h1><%= t '.heading' %></h1>

 <% end %>
 
 <% end %>
 

+<div id="login_login">

   <%= 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 class='deemphasize'><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+    <p class='deemphasize'><%= t '.no account' %> <%= link_to t('.register now'), :action => :new, :referer => params[:referer] %></p>

 
     <div id="loginForm" class="standard-form">
 
       <fieldset>
         <div class="form-row">
 
     <div id="loginForm" class="standard-form">
 
       <fieldset>
         <div class="form-row">

-          <label class="standard-label">
-            <%= t 'user.login.email or username' %>
+          <label for="username" class="standard-label">
+            <%= t '.email or username' %>

           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">

-          <label class="standard-label">
-            <%= t 'user.login.password' %>
+          <label for="password" class="standard-label">
+            <%= t '.password' %>

           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>
         <span class="form-help deemphasize">
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>
         <span class="form-help deemphasize">

-          <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>
+          <%= link_to t('.lost password link'), :controller => 'user', :action => 'lost_password' %>

         </span>
       </fieldset>
 
       <fieldset>
         </span>
       </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">
         <label for="remember_me" class="standard-label">

-          <%= t 'user.login.remember' %>
+          <%= t '.remember' %>

         </label>
         </label>

-        <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
+        <%= submit_tag t('.login_button'), :tabindex => 4 %>

       </fieldset>
 
       <fieldset class='form-divider'>
 
       </fieldset>
 
       <fieldset class='form-divider'>
 

-        <p class='standard-label'><%= t 'user.login.with external' %></p>
+        <p class='standard-label'><%= t '.with external' %></p>

 
         <ul class='clearfix' id="login_auth_buttons">
 
         <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>
-          <li><%= auth_button "google", "openid", :openid_url => "https://www.google.com/accounts/o8/id" %></li>
+          <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".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 -%>
+          <% if defined?(WIKIPEDIA_AUTH_ID) -%>
+          <li><%= auth_button "wikipedia", "wikipedia" %></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'>
           <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>
+          <label for='openid_url' class="standard-label"><%= raw t '.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 class='form-row'>
           <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
           <%= 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 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>
+          <label class="standard-label" for="remember_me_openid"><%= t '.remember' %></label>

         </div>
 
         </div>
 

-        <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+        <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>

 
       </fieldset>
 
 
       </fieldset>
 


@@ -68,22 +86,3 @@
   <% end %>
 
 </div>
   <% 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_auth_buttons").hide();
-    $("#login_openid_url").show();
-    $("#login_openid_submit").show();
-  });
-
-  $("#login_openid_url").hide();
-  $("#login_openid_submit").hide();
-});
-</script>