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

[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 9bfa23cbc75dc979d51a84571708c88ac19a8e1b..ac61d7df7bbb02c9b79f80d1b0a41bb7f7672768 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -15,13 +15,13 @@
     <div id="loginForm" class="standard-form">
 
       <fieldset>
-        <div class="form-row">
+        <div class="standard-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">
+        <div class="standard-form-row">
           <label for="password" class="standard-label">
             <%= t ".password" %>
           </label>
@@ -51,7 +51,7 @@
 
         <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 Settings.key?(:google_auth_id) -%>
           <li><%= auth_button "google", "google" %></li>
@@ -73,8 +73,8 @@
           <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>
+        <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>