Wrap evaluation of default values for parameters inside the HTML escaping

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

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index bc237f0a96a1153fbc0506cf5f4d8b1d761b2db0..3fa4091235024b6470b1a2ac159818e7f4db7fa4 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,20 +1,19 @@
 <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 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 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' %>
 
 
 <%= error_messages_for 'user' %>
 

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

 <table>
 <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>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>
 </table>

-
+<br>

 <br>
 <input type="submit" value="Signup">
 
 <br>
 <input type="submit" value="Signup">
 

-<%= end_form_tag %>
-
+<% end %>