refine grid + remove styling attributes from content id

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

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 2b113866608224b59eeafbc2825cba0f49ba3212..1368dfe19ddec28e093b8307f3954315f01b22fc 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,80 +1,85 @@
 <% content_for :heading do %>
-  <h1><%= t 'user.new.heading' %></h1>
+  <h1><%= t 'user.new.title' %></h1>
 <% end %>
 
-<p><%= t 'user.new.fill_form' %></p>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'col6 pad2' } do %>
+  <%= error_messages_for 'user' %>
 
-<%= error_messages_for 'user' %>
-
-<%= form_for :user, :url => { :action => 'terms' } do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <div id="signupForm" class="standard-form">
+
     <fieldset>
       <div class="form-row">
-        <label for="email" class="fieldName">
+        <label for="email" class="standard-label">
           <%= t 'user.new.email address' %>
         </label>
         <%= email_field(:user, :email, { :tabindex => 1 }) %>
       </div>
       <div class="form-row">
-        <label for="email_confirmation" class="fieldName">
+        <label for="email_confirmation" class="standard-label">
           <%= t 'user.new.confirm email address' %>
         </label>
         <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
       </div>
-    <p class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></p>
+    <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
     </fieldset>
 
     <fieldset>
       <div class="form-row">
-        <label for="display_name" class="fieldName">
+        <label for="display_name" class="standard-label">
           <%= t 'user.new.display name' %>
         </label>
         <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
       </div>
-      <p class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
+      <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
     </fieldset>
 
-    <fieldset id="openid_field">
+    <fieldset class="form-divider" id="openid_field">
       <div class="form-row">
-        <label for="openid_url" class="fieldName">
+        <label for="openid_url" class="standard-label">
           <%= raw t 'user.new.openid', :logo => openid_logo %>
         </label>
         <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
       </div>
+      <span id="openid_note" class="deemphasize">
+        <%= t 'user.new.openid no password' %>
+      </span>
     </fieldset>
 
     <fieldset>
       <div class="form-row">
-        <label for='user[pass_crypt]' class="fieldName">
+        <label for='user[pass_crypt]' class="standard-label">
           <%= t 'user.new.password' %>
         </label>
         <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
       </div>
       <div class="form-row">
-        <label class="fieldName">
+        <label class="standard-label">
           <%= t 'user.new.confirm password' %>
         </label>
         <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
       </div>
-      <span id="openid_prompt" class="">
-        <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
-      </span>
-      <span id="openid_note" class="">
-        <%= t 'user.new.openid no password' %>
-      </span>
     </fieldset>
+
+    <div id="openid_prompt" class="form-row">
+      <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
+    </div>
+
     <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
   </div>
 <% end %>
 
+<div class='col6 pad2'>
+  <h3><%= t 'user.new.about.header' %></h3>
+  <%= t 'user.new.about.html' %>
+</div>
+
 <script type="text/javascript">
 function enableOpenID()
 {
   $("#openid_prompt").hide();
 
-  $("#openid_spacer").show();
   $("#openid_field").show();
   $("#openid_note").show();
 
@@ -85,7 +90,6 @@ function disableOpenID()
 {
   $("#openid_prompt").show();
 
-  $("#openid_spacer").hide();
   $("#openid_field").hide();
   $("#openid_note").hide();