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 f006fde77be391c63374d707f13ee5116c6b375d..d51e52b5f7898f358a1d491f1f5addaefec6439b 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,43 +1,45 @@
-<h1><%= t 'user.terms.heading' %></h1>
-
-<p><%= t 'user.terms.read and accept' %></p>
-
-<!-- legale is <%= @legale %> -->
-<%= 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 %>").change(function () {
-          $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
-          $("#contributorTerms").load("<%= url_for :legale => legale %>");
-        });
-      // -->
-      </script>
-    <% end %>
-  </p>
+<% content_for :heading do %>
+  <h1><%= t 'user.terms.heading' %></h1>

 <% end %>
 
 <% end %>
 

-<div id="contributorTerms">
-  <%= render :partial => "terms" %>
-</div>
-
-<%= form_tag({:action => "save"}, { :id => "termsForm" }) 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? %>

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

       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>

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

     </div>
     </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 %>
+    <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>