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 ab54fba8281b71dc9231fdde85ac5427e787d236..947aafbf931d073b5397f3b40a9eb1b33f4a3909 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -21,11 +21,11 @@
     <%= f.primary t(".login_button"), :tabindex => 4 %>
   <% end %>
 
-  <div id="loginForm" class="standard-form">
+  <hr>
 
-    <fieldset class='form-divider'>
-
-      <p class='standard-label'><%= t ".with external" %></p>
+  <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>
@@ -50,18 +50,15 @@
       </ul>
 
       <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
-        <div id='login_openid_url' class='standard-form-row'>
-          <label for='openid_url' class="standard-label"><%= t ".openid_html", :logo => openid_logo %></label>
+        <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") %>
-          <span class="minorNote">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>
+          <%= 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>
 
-        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>
+        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %>
       <% end %>
-
-      </fieldset>
-
     </div>
-
+  </div>
 </div>