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

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

diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb
index 0944d7809868d5f0d1324df6dee01d3b96d5fd74..78ba25fa4139ac5f47458c4464b75279188a4039 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -3,62 +3,46 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>
 <% end %>
 
 <div id="login_login">
-  <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
-    <%= hidden_field_tag('referer', h(params[:referer])) %>
+  <p class='text-muted'><%= t ".no account" %> <%= link_to t(".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>
+  <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
+    <%= hidden_field_tag("referer", h(params[:referer])) %>
 
-    <div id="loginForm" class="standard-form">
+    <%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %>
+    <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "users", :action => "lost_password") %>
+    <%= f.form_group do %>
+      <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
+    <% end %>
 
-      <fieldset>
-        <div class="form-row">
-          <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 for="password" class="standard-label">
-            <%= t '.password' %>
-          </label>
-          <%= password_field_tag "password", "", :tabindex => 2 %>
-        </div>
-        <span class="form-help deemphasize">
-          <%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %>
-        </span>
-      </fieldset>
+    <%= f.primary t(".login_button"), :tabindex => 4 %>
+  <% end %>
 
-      <fieldset>
-        <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
-        <label for="remember_me" class="standard-label">
-          <%= t '.remember' %>
-        </label>
-        <%= submit_tag t('.login_button'), :tabindex => 4 %>
-      </fieldset>
+  <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
+    <div id="loginForm" class="standard-form">
 
       <fieldset class='form-divider'>
 
-        <p class='standard-label'><%= t '.with external' %></p>
+        <p class='standard-label'><%= t ".with external" %></p>
 
-        <ul class='clearfix' id="login_auth_buttons">
+        <ul class='list-unstyled' id="login_auth_buttons">
           <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) -%>
+          <% if Settings.key?(:google_auth_id) -%>
           <li><%= auth_button "google", "google" %></li>
           <% end -%>
-          <% if defined?(FACEBOOK_AUTH_ID) -%>
+          <% if Settings.key?(:facebook_auth_id) -%>
           <li><%= auth_button "facebook", "facebook" %></li>
           <% end -%>
-          <% if defined?(WINDOWSLIVE_AUTH_ID) -%>
+          <% if Settings.key?(:windowslive_auth_id) -%>
           <li><%= auth_button "windowslive", "windowslive" %></li>
           <% end -%>
-          <% if defined?(GITHUB_AUTH_ID) -%>
+          <% if Settings.key?(:github_auth_id) -%>
           <li><%= auth_button "github", "github" %></li>
           <% end -%>
-          <% if defined?(WIKIPEDIA_AUTH_ID) -%>
+          <% if Settings.key?(:wikipedia_auth_id) -%>
           <li><%= auth_button "wikipedia", "wikipedia" %></li>
           <% end -%>
           <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
@@ -66,18 +50,14 @@
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
         </ul>
 
-        <div id='login_openid_url' class='form-row'>
-          <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 'users.account.openid.link' %>" target="_new"><%= t 'users.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 '.remember' %></label>
+        <div id='login_openid_url' class='standard-form-row'>
+          <label for='openid_url' class="standard-label"><%= t ".openid_html", :logo => openid_logo %></label>
+          <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
+          <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>
+          <span class="minorNote">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>
         </div>
 
-        <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>
 
       </fieldset>