Merge 12304:14009 from trunk.

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

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 1b7f6e9b433bf58b30b9f2fc343f4910b3975699..823dccf520db76dd0a2032bd93ad6f568ed7cb64 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,8 +1,28 @@
-<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>
 
-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>
+<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
+
+<p>Unfortunately we are not currently able to create an account for
+   you automatically.
+</p>
+
+<p>Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a>
+   to arrange for an account to be created - we will try and deal with
+   the request as quickly as possible. 
+</p>
+
+<% else %>
+
+<p>Fill in the form and we'll send you a quick email to activate your
+   account.
+</p>
+
+<p>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>.
+</p>
 
 <%= error_messages_for 'user' %>
 
@@ -20,9 +40,6 @@ By creating an account, you agree that all work uploaded to openstreetmap.org an
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   <tr><td></td><td align=right><input type="submit" value="Signup"></td></tr>
 </table>
-<br>
-<br>
-<!--
-See also <a href="http://wiki.openstreetmap.org/index.php/Creating_an_Account" title="wiki help information about this screen">'Creating an Account' help</a>
--->
+<% end %>
+
 <% end %>