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

[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 b10a2b291f251fbd3d88e270e6be69e019e3628f..947aafbf931d073b5397f3b40a9eb1b33f4a3909 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -7,85 +7,58 @@
 <% end %>
 
 <div id="login_login">
 <% end %>
 
 <div id="login_login">

-  <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
-    <%= hidden_field_tag("referer", h(params[:referer])) %>
-
-    <p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
-
-    <div id="loginForm" class="standard-form">
+  <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>

 
 

-      <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>
-
-      <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>
+  <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
+    <%= hidden_field_tag("referer", h(params[:referer])) %>

 
 

-    </div>
+    <%= 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 %>

 
 

+    <%= f.primary t(".login_button"), :tabindex => 4 %>

   <% end %>
 
   <% end %>
 

-  <%= 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>
-
-        <ul class='clearfix' 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 Settings.key?(:google_auth_id) -%>
-          <li><%= auth_button "google", "google" %></li>
-          <% end -%>
-          <% if Settings.key?(:facebook_auth_id) -%>
-          <li><%= auth_button "facebook", "facebook" %></li>
-          <% end -%>
-          <% if Settings.key?(:windowslive_auth_id) -%>
-          <li><%= auth_button "windowslive", "windowslive" %></li>
-          <% end -%>
-          <% if Settings.key?(:github_auth_id) -%>
-          <li><%= auth_button "github", "github" %></li>
-          <% end -%>
-          <% if Settings.key?(: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'>
-          <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>
+  <hr>
+
+  <div id="loginForm">
+    <div class="form-group">
+      <label><%= t ".with external" %></label>
+
+      <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 Settings.key?(:google_auth_id) -%>
+        <li><%= auth_button "google", "google" %></li>
+        <% end -%>
+        <% if Settings.key?(:facebook_auth_id) -%>
+        <li><%= auth_button "facebook", "facebook" %></li>
+        <% end -%>
+        <% if Settings.key?(:windowslive_auth_id) -%>
+        <li><%= auth_button "windowslive", "windowslive" %></li>
+        <% end -%>
+        <% if Settings.key?(:github_auth_id) -%>
+        <li><%= auth_button "github", "github" %></li>
+        <% end -%>
+        <% if Settings.key?(: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>
+
+      <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
+        <div id='login_openid_url' class="form-group">
+          <label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>
+          <%= hidden_field_tag("referer", params[:referer]) %>
+          <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url form-control") %>
+          <span class="form-text text-muted">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>

         </div>
 
         </div>
 

-        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>
-
-      </fieldset>
-
+        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %>
+      <% end %>

     </div>
     </div>

-
-  <% end %>
-
+  </div>

 </div>
 </div>