Handle change from @to_user to @this_user for new message action

[rails.git] / app / views / user / terms.html.erb

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index d6bbd16f55dcd423a4c2bfa701298ed00a963201..849005274fc0e2ccdef8c0b867497c925b567fa5 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -3,20 +3,20 @@
 <p><%= t 'user.terms.read and accept' %></p>
 
 <!-- legale is <%= @legale %> -->
 <p><%= t 'user.terms.read and accept' %></p>
 
 <!-- legale is <%= @legale %> -->

-<% form_tag :action => 'terms' do %>
+<%= form_tag :action => 'terms' do %>

   <p>
     <%= t 'user.terms.legale_select' %>
     <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
   <p>
     <%= t 'user.terms.legale_select' %>
     <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>

-      <%=
-        radio_button_tag 'legale', legale, @legale == legale,
-          :onchange => remote_function(
-            :before => update_page do |page|
-              page.replace_html 'contributorTerms', image_tag('searching.gif')
-            end,
-            :url => {:legale => legale}
-          )
-      %>
+      <%= radio_button_tag 'legale', legale, @legale == legale %>

       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>

+      <script type="text/javascript">
+      <!--
+        $("#legale_<%= legale %>").change(function () {
+          $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
+          $("#contributorTerms").load("<%= url_for :legale => legale %>");
+        });
+      // -->
+      </script>

     <% end %>
   </p>
 <% end %>
     <% end %>
   </p>
 <% end %>


@@ -25,7 +25,7 @@
   <%= render :partial => "terms" %>
 </div>
 
   <%= render :partial => "terms" %>
 </div>
 

-<% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
+<%= form_tag({:action => "save"}, { :id => "termsForm" }) do %>

   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
     <%= check_box('user', 'consider_pd') %>
   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
     <%= check_box('user', 'consider_pd') %>


@@ -33,12 +33,13 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-    <% if params[:user] %>
+    <% if @user.new_record? %>

       <%= hidden_field('user', 'email') %>
       <%= hidden_field('user', 'email_confirmation') %>
       <%= hidden_field('user', 'display_name') %>
       <%= hidden_field('user', 'pass_crypt') %>
       <%= hidden_field('user', 'pass_crypt_confirmation') %>
       <%= hidden_field('user', 'email') %>
       <%= hidden_field('user', 'email_confirmation') %>
       <%= hidden_field('user', 'display_name') %>
       <%= hidden_field('user', 'pass_crypt') %>
       <%= hidden_field('user', 'pass_crypt_confirmation') %>

+      <%= hidden_field('user', 'openid_url') %>

     <% end %>
     <div id="buttons">
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     <% end %>
     <div id="buttons">
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>


@@ -46,11 +47,5 @@
     </div>
   </p>
   <br clear="all" />
     </div>
   </p>
   <br clear="all" />

-  <hr />
-  <p>
-    <ul>
-      <li><%= link_to(t('user.terms.summary'), t('user.terms.summary_url'), :target => :new)%></li>
-      <li><%= link_to(t('user.terms.translations'), t('user.terms.translations_url'), :target => :new)%></li>
-    </ul>
-  </p>
+  <p id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>

 <% end %>
 <% end %>