Mark some locale lookups as raw

[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 daa4396ff00859ae0ea6898ae6571ae5bbc88803..24f0f5bb6ccbe4ea2ccdc1f3e4da881e0f6a81c7 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,57 +1,36 @@
 <h1><%= t 'user.terms.heading' %></h1>
 
-<p><%= t 'user.terms.press accept button' %></p>
+<p><%= t 'user.terms.read and accept' %></p>
 
 <!-- legale is <%= @legale %> -->
-<% form_tag :action => 'terms' do %>
-  <p><%= t 'user.terms.legale_select' %></p>
-  <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
-    <%= radio_button_tag 'legale', legale, @legale == legale %>
-    <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %><br/>
-  <% end %>
-  <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-  <%= 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') %>
-  <%= submit_tag(t('user.terms.legale_button')) %>
+<%= form_tag :action => 'terms' do %>
+  <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 %>
+      <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
+      <script type="text/javascript">
+      <!--
+        $("legale_<%= legale %>").observe("change", function () {
+          <%= remote_function(
+                :before => update_page do |page|
+                  page.replace_html 'contributorTerms', image_tag('searching.gif')
+                end,
+                :url => { :legale => legale }
+              )
+          %>
+        });
+      // -->
+      </script>
+    <% end %>
+  </p>
 <% end %>
 
 <div id="contributorTerms">
-  <p id="first"><%= @text['intro'] %></p>
-  <ol>
-    <li>
-      <p><%= @text['section_1'] %></p>
-    </li>
-    <li>
-      <p><%= @text['section_2'] %></p>
-    </li>
-    <li>
-      <p><%= @text['section_3'] %></p>
-      <p><%= @text['active_defn_1'] %></p>
-      <p><%= @text['active_defn_2'] %></p>
-    </li>
-    <li>
-      <p><%= @text['section_4'] %></p>
-    </li>
-    <li>
-      <p><%= @text['section_5'] %></p>
-    </li>
-    <li>
-      <p><%= @text['section_6'] %></p>
-      <ol>
-        <li><p><%= @text['section_6_1'] %></p></li>
-        <li><p><%= @text['section_6_2'] %></p></li>
-      </ol>
-    </li>
-    <li>
-      <p id="last"><%= @text['section_7'] %></p>
-    </li>
-  </ol>
+  <%= render :partial => "terms" %>
 </div>
 
-<% form_tag :action => 'save' 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') %>
@@ -59,14 +38,19 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-    <%= 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') %>
-    <div class="left_right_line">
-      <div class="left"><a class="looks_like_button" href="<%= t 'user.terms.exit_wiki' %>"><%= t 'user.terms.decline' %></a></div>
-      <div class="right"><%= submit_tag(t('user.terms.button'), :class => 'float_right') %></div>
+    <% 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', 'openid_url') %>
+    <% end %>
+    <div id="buttons">
+      <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
     </div>
   </p>
+  <br clear="all" />
+  <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 %>