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

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

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 5acaa4e958e2819b1b521d66435dfc79504239eb..6f97a284a583559d94c977fb2ab0de4f332c4ae6 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -19,14 +19,14 @@
       <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
 
       <fieldset>
-        <div class="form-row">
+        <div class="standard-form-row">
           <label for="email" class="standard-label">
             <%= t ".email address" %>
           </label>
           <%= f.email_field(:email, :tabindex => 1) %>
           <%= f.error_message_on(:email) %>
         </div>
-        <div class="form-row">
+        <div class="standard-form-row">
           <label for="email_confirmation" class="standard-label">
             <%= t ".confirm email address" %>
           </label>
@@ -37,7 +37,7 @@
       </fieldset>
 
       <fieldset>
-        <div class="form-row">
+        <div class="standard-form-row">
           <label for="display_name" class="standard-label">
             <%= t ".display name" %>
           </label>
@@ -48,11 +48,11 @@
       </fieldset>
 
       <fieldset class="form-divider" id="auth_field">
-        <div class="form-row">
+        <div class="standard-form-row">
           <label for="openid_url" class="standard-label">
             <%= t ".external auth" %>
           </label>
-          <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
+          <%= f.select(:auth_provider, Auth.providers, :default => "", :tabindex => 4) %>
           <%= f.text_field(:auth_uid, :tabindex => 5) %>
           <%= f.error_message_on(:auth_uid) %>
         </div>
@@ -60,14 +60,14 @@
       </fieldset>
 
       <fieldset>
-        <div class="form-row">
+        <div class="standard-form-row">
           <label for='user[pass_crypt]' class="standard-label">
             <%= t ".password" %>
           </label>
           <%= f.password_field(:pass_crypt, :tabindex => 6) %>
           <%= f.error_message_on(:pass_crypt) %>
         </div>
-        <div class="form-row">
+        <div class="standard-form-row">
           <label class="standard-label">
             <%= t ".confirm password" %>
           </label>
@@ -76,7 +76,7 @@
         </div>
       </fieldset>
 
-      <div id="auth_prompt" class="form-row">
+      <div id="auth_prompt" class="standard-form-row">
         <%= link_to t(".use external auth"), "#", :id => "auth_enable" %>
       </div>