Use a consistent host name in cache keys

[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 f9d77a22bce5c5043e91aeddd7a1c066cfaf4ef9..e8400eb9019a687c629a5c8eac5d5eb82e8e6fdb 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,39 +1,31 @@
 <h1><%= t 'user.new.heading' %></h1>
 
 <h1><%= t 'user.new.heading' %></h1>
 

-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
-
-<p><%= t 'user.new.no_auto_account_create' %></p>
-
-<p><%= t 'user.new.contact_webmaster' %></p>
-
-<% else %>
-

 <p><%= t 'user.new.fill_form' %></p>
 
 <%= error_messages_for 'user' %>
 
 <p><%= t 'user.new.fill_form' %></p>
 
 <%= error_messages_for 'user' %>
 

-<% form_tag :action => 'terms' do %>
+<%= form_for :user, :url => { :action => 'terms' } do %>

   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
     <tr>
       <td class="fieldName"><%= t 'user.new.email address' %></td>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
     <tr>
       <td class="fieldName"><%= t 'user.new.email address' %></td>

-      <td><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => params[:email] }) %></td>
+      <td><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>

     </tr>
     <tr>
       <td class="fieldName"><%= t 'user.new.confirm email address' %></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, :value => params[:email] }) %></td>
+      <td><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>

     </tr>
     <tr>
       <td></td>
     </tr>
     <tr>
       <td></td>

-      <td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td>
+      <td><span class="minorNote"><%= raw(t 'user.new.not displayed publicly') %></span></td>

     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
     <tr>
       <td class="fieldName"><%= t 'user.new.display name' %></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, :value => params[:nickname] }) %></td></tr>
+      <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>
       <td></td>
       <td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>


@@ -42,8 +34,8 @@
     <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
     <tr id="openid_field">
     <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
     <tr id="openid_field">

-      <td class="fieldName"><%= t 'user.new.openid', :logo => openid_logo %></td>
-      <td><%= text_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :value => params[:openid], :class => "openid_url" }) %></td>
+      <td class="fieldName"><%= raw t 'user.new.openid', :logo => openid_logo %></td>
+      <td><%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></td>

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


@@ -59,7 +51,7 @@
     <tr>
       <td></td>
       <td>
     <tr>
       <td></td>
       <td>

-        <span id="openid_prompt" class="minorNote"><%= link_to_function(t('user.new.use openid', :logo => openid_logo), "enableOpenID()") %></span>
+        <span id="openid_prompt" class="minorNote"><%= link_to_function(raw(t('user.new.use openid', :logo => openid_logo)), "enableOpenID()") %></span>

         <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
       </td>
     </tr>
         <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
       </td>
     </tr>


@@ -76,24 +68,24 @@
 <script type="text/javascript">
 function enableOpenID()
 {
 <script type="text/javascript">
 function enableOpenID()
 {

-  $("openid_prompt").hide();
+  $("#openid_prompt").hide();

 
 

-  $("openid_spacer").show();
-  $("openid_field").show();
-  $("openid_note").show();
+  $("#openid_spacer").show();
+  $("#openid_field").show();
+  $("#openid_note").show();

 
 

-  $("openid_url").disabled = false;
+  $("#openid_url").prop("disabled", false);

 }
 
 function disableOpenID()
 {
 }
 
 function disableOpenID()
 {

-  $("openid_prompt").show();
+  $("#openid_prompt").show();

 
 

-  $("openid_spacer").hide();
-  $("openid_field").hide();
-  $("openid_note").hide();
+  $("#openid_spacer").hide();
+  $("#openid_field").hide();
+  $("#openid_note").hide();

 
 

-  $("openid_url").disabled = true;
+  $("#openid_url").prop("disabled", true);

 }
 
 <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
 }
 
 <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>


@@ -102,7 +94,3 @@ enableOpenID();
 disableOpenID();
 <% end -%>
 </script>
 disableOpenID();
 <% end -%>
 </script>

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