Send meta information with error pages

[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 d4a9fa0bd4e5267c8b162512e761d97916f6fcb5..33ca3a3e63e030531c0304cf934d74d8cd7e29ca 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -7,20 +7,20 @@
   <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 %> -->
   <p class="deemphasize"><%= t ".read and accept with tou" %></p>
   <!-- legale is <%= @legale %> -->
   <p class="deemphasize"><%= t ".read and accept with tou" %></p>

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

     <%= t ".heading_ct" %>
     <%= t ".heading_ct" %>

-  </label>
-  <div class='form-row horizontal-list'>
+  </h4>
+  <div class='standard-form-row horizontal-list clearfix'>

     <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
 
     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>
     <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
 
     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>

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

         <label for="legale_<%= legale %>">
           <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
           <%= t(".legale_names." + name) %>
         <label for="legale_<%= legale %>">
           <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
           <%= t(".legale_names." + name) %>


@@ -29,29 +29,29 @@
     <% end %>
   </div>
 
     <% end %>
   </div>
 

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

     <%= render :partial => "terms" %>
   </div>
 
   <div>
     <p id="contributorGuidance" class="deemphasize">
     <%= render :partial => "terms" %>
   </div>
 
   <div>
     <p id="contributorGuidance" class="deemphasize">

-      <%= raw t ".guidance",
-                :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
-                :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
+      <%= 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>
     </p>
   </div>

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

     <label for="read_ct">
       <%= check_box_tag "read_ct" %>
       <%= t ".read_ct" %>
     </label>
   </div>
 
     <label for="read_ct">
       <%= check_box_tag "read_ct" %>
       <%= t ".read_ct" %>
     </label>
   </div>
 

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

     <%= t "layouts.tou" %>
     <%= t "layouts.tou" %>

-  </label>
+  </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>
   <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">
+  <div class="standard-form-row">

     <label for="read_tou">
       <%= check_box_tag "read_tou" %>
       <%= t ".read_tou" %>
     <label for="read_tou">
       <%= check_box_tag "read_tou" %>
       <%= t ".read_tou" %>


@@ -59,7 +59,7 @@
 
     <%= 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">
+    <div class="buttons standard-form-row py-3 clearfix">

       <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
       <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>
     </div>
       <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
       <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>
     </div>