Use querystring, stop manually building urls

[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 23e2ba0681975ac64cb8fd16eaf8a506749129b8..d51e52b5f7898f358a1d491f1f5addaefec6439b 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,68 +1,45 @@
-<h1><%= t 'user.terms.heading' %></h1>
-
-<p><%= t 'user.terms.press accept button' %></p>
-
-<p><%= t 'user.terms.legale_select' %>
-<% form_tag :action => 'terms' do %>
-  <select name="legale">
-    <%= options_for_select([['United Kingdom (default)', 'GB'], ['France', 'FR'], ['Italy', 'IT']], params[:legale]) %>
-    <%= 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')) %>
-  </select>
-<% end %></p>
-
-<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>
-</div>
+<% content_for :heading do %>
+  <h1><%= t 'user.terms.heading' %></h1>
+<% end %>

 
 

-<% form_tag :action => 'save' do %>
-  <p>
-    <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
-    <%= check_box('user', 'consider_pd') %>
-    <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
-  </p>
-  <p>
+<div id="terms">
+  <div class="directions">
+    <p><%= t 'user.terms.read and accept' %></p>
+    
+    <!-- legale is <%= @legale %> -->
+    <%= form_tag :action => 'terms' do %>
+      <p><%= t 'user.terms.legale_select' %></p>
+      <fieldset>
+      <% [['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 %>").change(function () {
+            $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
+            $("#contributorTerms").load("<%= url_for :legale => legale %>");
+          });
+        // -->
+        </script>
+      <% end %>
+      </fieldset>
+    <% end %>
+  </div> 
+  <div class="legale">
+    <%= render :partial => "terms" %>
+  </div>
+  
+  <%= form_tag({:action => "save"}, { :class => "sign" }) do %>
+    <p>
+      <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
+      <%= check_box('user', 'consider_pd') %>
+      <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
+    </p>

     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
     <%= 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') %>
-    <a href="<%= t 'user.terms.exit_wiki' %>"><%= t 'user.terms.decline' %></a>
-    <%= submit_tag(t('user.terms.button')) %>
-  </p>
-<% end %>
+    <div class="signing-buttons buttons">
+      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
+      <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+    </div>
+    <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 %>
+</terms>