Merge pull request #5283 from consuldemocracy/label_links

Allow links in forms to open in new tabs
This commit is contained in:
Javi Martín
2023-10-24 16:30:59 +02:00
committed by GitHub
28 changed files with 95 additions and 58 deletions

View File

@@ -62,11 +62,7 @@
<div class="small-12 column">
<% if @proposal.new_record? %>
<%= f.check_box :terms_of_service,
title: t("form.accept_terms_title"),
label: t("form.accept_terms",
policy: link_to(t("form.policy"), "/privacy", target: "blank"),
conditions: link_to(t("form.conditions"), "/conditions", target: "blank")) %>
<%= render Shared::AgreeWithTermsOfServiceFieldComponent.new(f) %>
<% end %>
</div>

View File

@@ -25,12 +25,9 @@
label: t("devise_views.organizations.registrations.new.password_confirmation_label") %>
<%= f.check_box :terms_of_service,
title: t("devise_views.users.registrations.new.terms_title"),
label: t("devise_views.users.registrations.new.terms",
terms: link_to(t("devise_views.users.registrations.new.terms_link"),
"/conditions",
title: t("shared.target_blank"),
target: "_blank")) %>
terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
"/conditions")) %>
<div class="small-12 medium-6 small-centered">
<%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>

View File

@@ -35,12 +35,9 @@
<% end %>
<%= f.check_box :terms_of_service,
title: t("devise_views.users.registrations.new.terms_title"),
label: t("devise_views.users.registrations.new.terms",
terms: link_to(t("devise_views.users.registrations.new.terms_link"),
"/conditions",
title: t("shared.target_blank"),
target: "_blank")) %>
terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
"/conditions")) %>
<div class="small-12 medium-6 small-centered">
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>

View File

@@ -69,12 +69,9 @@
<div class="small-12">
<%= f.check_box :terms_of_service,
title: t("verification.residence.new.accept_terms_text_title"),
label: t("verification.residence.new.accept_terms_text",
terms_url: link_to(t("verification.residence.new.terms"),
page_path("census_terms"),
title: t("shared.target_blank"),
target: "_blank")) %>
terms_url: new_window_link_to(t("verification.residence.new.terms"),
page_path("census_terms"))) %>
</div>
<div class="small-12 medium-3 clear">