Use cancancan to authorize user_preference_controller

[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 258b6e0b3d63d198d2e371b7a65c87f3d3e6269c..a836c859020a3d3526d538d60718ba4d4b58735a 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,53 +1,54 @@
-<h1><%= t 'user.terms.heading' %></h1>
-
-<p><%= t 'user.terms.press accept button' %></p>
-
-<div id="contributorTerms">
-  <p id="first"><%= t 'legal.contributor_terms.intro' %></p>
-  <ol>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_1' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_3' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_1' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_4' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_5' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_6' %></p>
-      <ol>
-        <li><p><%= t 'legal.contributor_terms.section_6_1' %></p></li>
-        <li><p><%= t 'legal.contributor_terms.section_6_2' %></p></li>
-      </ol>
-    </li>
-    <li>
-      <p id="last"><%= t 'legal.contributor_terms.section_7' %></p>
-    </li>
-  </ol>
-</div>
-
-<% 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>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for :heading do %>
+  <h1><%= t '.heading' %></h1>
+  <div class='header-illustration new-user-terms'></div>
+<% end %>
+
+<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
+  <!-- legale is <%= @legale %> -->
+  <div class='form-row horizontal-list'>
+    <label class="standard-label">
+      <%= t '.legale_select' %>
+    </label>
+
+    <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
+      <div class="form-row">
+        <label for="legale_<%= legale %>">
+          <%= radio_button_tag 'legale', legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
+          <%= t('.legale_names.' + name) %>
+        </label>
+      </div>
+    <% end %>
+  </div>
+
+  <div id="contributorTerms" class="col12 legale">
+    <%= render :partial => "terms" %>
+  </div>
+
+  <div class="form-row">
+    <label for="user_consider_pd">
+      <%= check_box('user', 'consider_pd') %>
+      <%= t '.consider_pd' %>
+    </label>
+    <span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new)%>)</span>
+

     <%= 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') %>
-    <%= submit_tag(t('user.terms.button')) %>
-  </p>
+
+    <div class="buttons form-row inner20 clearfix">
+      <p class="deemphasize"><%= t '.read and accept' %></p>
+      <%= submit_tag(t('.agree'), :name => "agree", :id => "agree") %>
+      <%= submit_tag(t('.decline'), :name => "decline", :id => "decline") %>
+    </div>
+
+    <div class="deemphasize">
+      <p id="contributorGuidance">
+        <%= raw t '.guidance',
+                  :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
+                  :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+      </p>
+    </div>
+  </div>

 <% end %>
 <% end %>