X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6db326aa1f084a062a3b658876bc01bf650f5702..65cb7d7b2d745ed10eaa5248dcd0e5bb834c2556:/app/views/users/terms.html.erb?ds=sidebyside diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb index d4a9fa0bd..e2ece8f1a 100644 --- a/app/views/users/terms.html.erb +++ b/app/views/users/terms.html.erb @@ -2,73 +2,83 @@ <%= javascript_include_tag "user" %> <% end %> +<% content_for :heading_class, "pb-0" %> <% 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" }, { :class => " inner22 standard-form fillL" }) do %> +<%= form_tag({ :action => "save" }) do %> <!-- legale is <%= @legale %> --> - <p class="deemphasize"><%= t ".read and accept with tou" %></p> - <label class="standard-label"> + <p class="text-muted"><%= t ".read and accept with tou" %></p> + <h4> <%= t ".heading_ct" %> + </h4> + <p class="text-muted"><%= t ".contributor_terms_explain" %></p> + <label class="form-label"> + <%= t ".legale_select" %> </label> - <div class='form-row horizontal-list'> - <p class="deemphasize"><%= t ".contributor_terms_explain" %></p> - <label class="standard-label"> - <%= t ".legale_select" %> - </label> - + <div class="mb-3"> <% [%w[france FR], %w[italy IT], %w[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) %> + <div class="form-check form-check-inline"> + <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) }, :class => "form-check-input" %> + <label for="legale_<%= legale %>" class="form-check-label"> + <%= t(".legale_names.#{name}") %> </label> </div> <% end %> </div> - <div id="contributorTerms" class="col12 legale"> + <div id="contributorTerms" class="legale border border-grey rounded"> <%= 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" %> + <p id="contributorGuidance" class="text-muted"> + <%= t ".guidance_info_html", + :readable_summary_link => link_to(t(".readable_summary"), + "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary"), + :informal_translations_link => link_to(t(".informal_translations"), + "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations") %> </p> </div> - <div class="form-row"> - <label for="read_ct"> - <%= check_box_tag "read_ct" %> - <%= t ".read_ct" %> - </label> + <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"> + <%= t ".read_ct" %> + </label> + </div> </div> - <label class="standard-label"> + <h4> <%= t "layouts.tou" %> - </label> - <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> + </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> - <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %> - - <div class="buttons form-row inner20 clearfix"> - <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %> - <%= submit_tag("Cancel", :name => "decline", :id => "decline") %> + <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"> + <%= t ".read_tou" %> + </label> </div> + </div> + + <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %> - <label for="user_consider_pd"> - <%= check_box("user", "consider_pd") %> + <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> + + <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"> <%= t ".consider_pd" %> </label> <span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span> - </div> <% end %>