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

[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 99af8b84185e6a3da2b8cd3dccb75f19372ff39e..f161667029dbad3b7cd8d8602d8aa518919020b1 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -2,9 +2,11 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
   <%= javascript_include_tag "user" %>
 <% end %>
 

+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t ".heading" %></h1>
-  <div class='header-illustration new-user-terms'></div>
+  <div class='header-illustration new-user-terms'>
+    <h1><%= t ".heading" %></h1>
+  </div>

 <% end %>
 
 <%= form_tag({ :action => "save" }) do %>
 <% end %>
 
 <%= form_tag({ :action => "save" }) do %>


@@ -14,10 +16,10 @@
     <%= t ".heading_ct" %>
   </h4>
   <p class="text-muted"><%= t ".contributor_terms_explain" %></p>
     <%= t ".heading_ct" %>
   </h4>
   <p class="text-muted"><%= t ".contributor_terms_explain" %></p>

-  <label>
+  <label class="form-label">

     <%= t ".legale_select" %>
   </label>
     <%= t ".legale_select" %>
   </label>

-  <div class="form-group">
+  <div class="mb-3">

     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>
       <div class="form-check form-check-inline">
         <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) }, :class => "form-check-input" %>
     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>
       <div class="form-check form-check-inline">
         <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) }, :class => "form-check-input" %>


@@ -28,7 +30,7 @@
     <% end %>
   </div>
 
     <% end %>
   </div>
 

-  <div id="contributorTerms" class="legale">
+  <div id="contributorTerms" class="legale border border-grey rounded">

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


@@ -39,7 +41,7 @@
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
     </p>
   </div>
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
     </p>
   </div>

-  <div class="form-group">
+  <div class="mb-3">

     <div class="form-check">
       <%= check_box_tag "read_ct", "1", false, :class => "form-check-input" %>
       <label for="read_ct" class="form-check-label">
     <div class="form-check">
       <%= check_box_tag "read_ct", "1", false, :class => "form-check-input" %>
       <label for="read_ct" class="form-check-label">


@@ -53,7 +55,7 @@
   </h4>
   <p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
 
   </h4>
   <p class="text-muted"><%= 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-group">
+  <div class="mb-3">

     <div class="form-check">
       <%= check_box_tag "read_tou", "1", false, :class => "form-check-input" %>
       <label for="read_tou" class="form-check-label">
     <div class="form-check">
       <%= check_box_tag "read_tou", "1", false, :class => "form-check-input" %>
       <label for="read_tou" class="form-check-label">


@@ -64,12 +66,12 @@
 
   <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
 
   <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 

-  <div class="form-group">
+  <div class="mb-3">

     <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true, :class => "btn btn-primary") %>
     <%= submit_tag("Cancel", :name => "decline", :id => "decline", :class => "btn btn-outline-secondary") %>
   </div>
 
     <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true, :class => "btn btn-primary") %>
     <%= submit_tag("Cancel", :name => "decline", :id => "decline", :class => "btn btn-outline-secondary") %>
   </div>
 

-  <div class="form-group">
+  <div class="mb-3">

     <div class="form-check">
       <%= check_box("user", "consider_pd", :class => "form-check-input") %>
     <label for="user_consider_pd" class="form-check-label">
     <div class="form-check">
       <%= check_box("user", "consider_pd", :class => "form-check-input") %>
     <label for="user_consider_pd" class="form-check-label">