Merge branch 'master' into terms

[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 a25097e16ca11a03bfcdaea4a9bdf95258439a63..66d8826c2d4fcc0ed227a4208edecabb534b2704 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -13,27 +13,26 @@
 <p><%= t 'user.new.fill_form' %>
 </p>
 
 <p><%= t 'user.new.fill_form' %>
 </p>
 

-<p><%= t 'user.new.license_agreement' %>
-</p>
-

 <%= error_messages_for 'user' %>
 
 <%= error_messages_for 'user' %>
 

-<% form_tag :action => 'save' do %>
+<% form_tag :action => 'terms' do %>

 <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
 <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-<table id="loginForm">
+<table id="signupForm">

   <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.confirm email address' %></td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
   <tr><td></td><td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.confirm email address' %></td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
   <tr><td></td><td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td></tr>

-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>

   <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>
   <tr><td></td><td><span class="minorNote"><%= t 'user.new.display name description' %></span></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>
   <tr><td></td><td><span class="minorNote"><%= t 'user.new.display name description' %></span></td></tr>

-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>

   <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
   
   <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
   

-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td></td><td align=right><input type="submit" value="<%= t'user.new.signup' %>" tabindex="6"></td></tr>
+  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td></td><td align="right"><input type="submit" value="<%= t'user.new.continue' %>" tabindex="6"></td></tr>

 </table>
 <% end %>
 
 </table>
 <% end %>
 

+<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
+

 <% end %>
 <% end %>