diff --git a/app/components/admin/site_customization/pages/index_component.html.erb b/app/components/admin/site_customization/pages/index_component.html.erb index 68db19b5f..c5f6ebac0 100644 --- a/app/components/admin/site_customization/pages/index_component.html.erb +++ b/app/components/admin/site_customization/pages/index_component.html.erb @@ -34,7 +34,7 @@ <%= actions.action(:show, text: t("admin.site_customization.pages.index.see_page"), path: page.url, - options: { target: "_blank" }) %> + target: "_blank") %> <% end %> <% end %> diff --git a/app/components/budgets/investments/form_component.html.erb b/app/components/budgets/investments/form_component.html.erb index 228aec322..f5aa72e31 100644 --- a/app/components/budgets/investments/form_component.html.erb +++ b/app/components/budgets/investments/form_component.html.erb @@ -89,11 +89,7 @@
<% unless current_user.manager? || investment.persisted? %>
- <%= 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 %> diff --git a/app/components/debates/form_component.html.erb b/app/components/debates/form_component.html.erb index 851269d1b..1816d437c 100644 --- a/app/components/debates/form_component.html.erb +++ b/app/components/debates/form_component.html.erb @@ -41,11 +41,7 @@
<% if debate.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 %> diff --git a/app/components/debates/new_component.html.erb b/app/components/debates/new_component.html.erb index 91510dd95..17fb6c9b9 100644 --- a/app/components/debates/new_component.html.erb +++ b/app/components/debates/new_component.html.erb @@ -2,9 +2,7 @@ <%= back_link_to debates_path, t("debates.index.section_header.title") %> <%= header do %> - <%= link_to help_path(anchor: "debates"), title: t("shared.target_blank"), target: "_blank" do %> - <%= t("debates.new.more_info") %> - <% end %> + <%= link_to t("debates.new.more_info"), help_path(anchor: "debates") %> <% end %>
diff --git a/app/components/proposals/form_component.html.erb b/app/components/proposals/form_component.html.erb index fddca56bb..c4467fe7d 100644 --- a/app/components/proposals/form_component.html.erb +++ b/app/components/proposals/form_component.html.erb @@ -96,11 +96,7 @@
<% 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 %> diff --git a/app/components/proposals/new_component.html.erb b/app/components/proposals/new_component.html.erb index 986f230dd..508335b8d 100644 --- a/app/components/proposals/new_component.html.erb +++ b/app/components/proposals/new_component.html.erb @@ -2,9 +2,7 @@ <%= back_link_to proposals_path, t("proposals.index.section_header.title") %> <%= header do %> - <%= link_to help_path(anchor: "proposals"), title: t("shared.target_blank"), target: "_blank" do %> - <%= t("proposals.new.more_info") %> - <% end %> + <%= new_window_link_to t("proposals.new.more_info"), help_path(anchor: "proposals") %> <% end %>