Merge remote-tracking branch 'upstream/pull/2495'

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

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index a836c859020a3d3526d538d60718ba4d4b58735a..243ce2863042040d306de0ca8867fcda1deecd58 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -3,52 +3,72 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

   <div class='header-illustration new-user-terms'></div>
 <% end %>
 
   <div class='header-illustration new-user-terms'></div>
 <% end %>
 

-<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
+<%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>

   <!-- legale is <%= @legale %> -->
   <!-- legale is <%= @legale %> -->

-  <div class='form-row horizontal-list'>
+  <p class="deemphasize"><%= t ".read and accept with tou" %></p>
+  <h4>
+    <%= t ".heading_ct" %>
+  </h4>
+  <div class='form-row horizontal-list clearfix'>
+    <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>

     <label class="standard-label">
     <label class="standard-label">

-      <%= t '.legale_select' %>
+      <%= t ".legale_select" %>

     </label>
 
     </label>
 

-    <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
+    <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>

       <div class="form-row">
         <label for="legale_<%= 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) %>
+          <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
+          <%= t(".legale_names." + name) %>

         </label>
       </div>
     <% end %>
   </div>
 
         </label>
       </div>
     <% end %>
   </div>
 

-  <div id="contributorTerms" class="col12 legale">
+  <div id="contributorTerms" class="legale">

     <%= render :partial => "terms" %>
   </div>
 
     <%= render :partial => "terms" %>
   </div>
 

+  <div>
+    <p id="contributorGuidance" class="deemphasize">
+      <%= t ".guidance_html",
+            :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
+            :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
+    </p>
+  </div>

   <div class="form-row">
   <div class="form-row">

-    <label for="user_consider_pd">
-      <%= check_box('user', 'consider_pd') %>
-      <%= t '.consider_pd' %>
+    <label for="read_ct">
+      <%= check_box_tag "read_ct" %>
+      <%= t ".read_ct" %>
+    </label>
+  </div>
+
+  <h4>
+    <%= t "layouts.tou" %>
+  </h4>
+  <p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
+  <div class="form-row">
+    <label for="read_tou">
+      <%= check_box_tag "read_tou" %>
+      <%= t ".read_tou" %>

     </label>
     </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? %>

 
 

-    <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 class="buttons form-row py-3 clearfix">
+      <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
+      <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>

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

   </div>
 <% end %>
   </div>
 <% end %>