X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88297a682cd76ab9290cd8bf278424bf5c8458e5..2c16177174d276335babcca5439cd4e97af62ffa:/app/views/user/new.rhtml?ds=sidebyside

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 00ab2c7d8..5d4687edd 100644
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,18 +1,20 @@
 <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 on openstreetmap.org is to be licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this</a> Creative Commons license.<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>
 
-<%= start_form_tag :action => 'save' %>
+<%= 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>Login 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>retype password:</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
+  <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>
 </table>
-
+<br>
 <br>
 <input type="submit" value="Signup">
 
-<%= end_form_tag %>
-
+<% end %>