changing the belongs_to and has_many items in the models to reflect the new foriegn...

[rails.git] / app / views / user / new.rhtml

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 3fa4091235024b6470b1a2ac159818e7f4db7fa4..5d4687edd2acc0b969d94d6dfb0bbb69178b839d 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,13 +1,14 @@
 <h1>Create a user account</h1><br>
 Fill in the form and we'll send you a quick email to activate your account.<br><br>
 
 <h1>Create a user account</h1><br>
 Fill in the form and we'll send you a quick email to activate your account.<br><br>
 

-By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.<br><br>
+By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.<br><br>

 
 <%= error_messages_for 'user' %>
 
 <% form_tag :action => 'save' do %>
 <table>
   <tr><td>Email Address</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
 
 <%= error_messages_for 'user' %>
 
 <% form_tag :action => 'save' do %>
 <table>
   <tr><td>Email Address</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>

+  <tr><td>Confirm Email Address</td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>

   <tr><td>Display Name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Password</td><td><%= password_field('user', 'pass_crypt',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Confirm Password</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Display Name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Password</td><td><%= password_field('user', 'pass_crypt',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Confirm Password</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>