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

[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 b84adca888b24720a56e890694d59dc53988a7b0..5acaa4e958e2819b1b521d66435dfc79504239eb 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -3,80 +3,84 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.title' %></h1>
+  <h1><%= t ".title" %></h1>

   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 

-<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %>
-  <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
+<div class="row">
+  <div class='text-muted col-sm order-sm-2'>
+    <h4><%= t ".about.header" %></h4>
+    <%= t ".about.html" %>
+  </div>

 
 

-  <fieldset>
-    <div class="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">
-      <label for="email_confirmation" class="standard-label">
-        <%= t '.confirm email address' %>
-      </label>
-      <%= f.email_field(:email_confirmation, :tabindex => 2) %>
-      <%= f.error_message_on(:email_confirmation) %>
-    </div>
-    <span class="form-help deemphasize"><%= raw(t '.not displayed publicly') %></span>
-  </fieldset>
+  <div class="col-sm">
+    <%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form" } do |f| %>
+      <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>

 
 

-  <fieldset>
-    <div class="form-row">
-      <label for="display_name" class="standard-label">
-        <%= t '.display name' %>
-      </label>
-      <%= f.text_field(:display_name, :tabindex => 3) %>
-      <%= f.error_message_on(:display_name) %>
-    </div>
-    <span class="form-help deemphasize"><%= t '.display name description' %></span>
-  </fieldset>
+      <fieldset>
+        <div class="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">
+          <label for="email_confirmation" class="standard-label">
+            <%= t ".confirm email address" %>
+          </label>
+          <%= f.email_field(:email_confirmation, :tabindex => 2) %>
+          <%= f.error_message_on(:email_confirmation) %>
+        </div>
+        <span class="form-help deemphasize"><%= t(".not_displayed_publicly_html") %></span>
+      </fieldset>

 
 

-  <fieldset class="form-divider" id="auth_field">
-    <div class="form-row">
-      <label for="openid_url" class="standard-label">
-        <%= raw t '.external auth' %>
-      </label>
-      <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
-      <%= f.text_field(:auth_uid, :tabindex => 5) %>
-      <%= f.error_message_on(:auth_uid) %>
-    </div>
-    <span class="form-help deemphasize"><%= t '.auth no password' %></span>
-  </fieldset>
+      <fieldset>
+        <div class="form-row">
+          <label for="display_name" class="standard-label">
+            <%= t ".display name" %>
+          </label>
+          <%= f.text_field(:display_name, :tabindex => 3) %>
+          <%= f.error_message_on(:display_name) %>
+        </div>
+        <span class="form-help deemphasize"><%= t ".display name description" %></span>
+      </fieldset>

 
 

-  <fieldset>
-    <div class="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">
-      <label class="standard-label">
-        <%= t '.confirm password' %>
-      </label>
-      <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
-      <%= f.error_message_on(:pass_crypt_confirmation) %>
-    </div>
-  </fieldset>
+      <fieldset class="form-divider" id="auth_field">
+        <div class="form-row">
+          <label for="openid_url" class="standard-label">
+            <%= t ".external auth" %>
+          </label>
+          <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
+          <%= f.text_field(:auth_uid, :tabindex => 5) %>
+          <%= f.error_message_on(:auth_uid) %>
+        </div>
+        <span class="form-help deemphasize"><%= t ".auth no password" %></span>
+      </fieldset>

 
 

-  <div id="auth_prompt" class="form-row">
-    <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
-  </div>
+      <fieldset>
+        <div class="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">
+          <label class="standard-label">
+            <%= t ".confirm password" %>
+          </label>
+          <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
+          <%= f.error_message_on(:pass_crypt_confirmation) %>
+        </div>
+      </fieldset>

 
 

-  <%= submit_tag t('.continue'), :tabindex => 8 %>
-<% end %>
+      <div id="auth_prompt" class="form-row">
+        <%= link_to t(".use external auth"), "#", :id => "auth_enable" %>
+      </div>

 
 

-<div class='aside col6 deemphasize inner22'>
-  <h4><%= t '.about.header' %></h4>
-  <%= t '.about.html' %>
+      <%= submit_tag t(".continue"), :tabindex => 8 %>
+    <% end %>
+  </div>

 </div>
 </div>