Extract method to open links in a new window
This way we can slightly simplify the code.
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
<%= back_link_to debates_path, t("debates.index.section_header.title") %>
|
<%= back_link_to debates_path, t("debates.index.section_header.title") %>
|
||||||
|
|
||||||
<%= header do %>
|
<%= header do %>
|
||||||
<%= link_to t("debates.new.more_info"), help_path(anchor: "debates"), title: t("shared.target_blank"), target: "_blank" %>
|
<%= link_to t("debates.new.more_info"), help_path(anchor: "debates") %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<aside>
|
<aside>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class Debates::NewComponent < ApplicationComponent
|
class Debates::NewComponent < ApplicationComponent
|
||||||
include Header
|
include Header
|
||||||
attr_reader :debate
|
attr_reader :debate
|
||||||
|
delegate :new_window_link_to, to: :helpers
|
||||||
|
|
||||||
def initialize(debate)
|
def initialize(debate)
|
||||||
@debate = debate
|
@debate = debate
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<%= back_link_to proposals_path, t("proposals.index.section_header.title") %>
|
<%= back_link_to proposals_path, t("proposals.index.section_header.title") %>
|
||||||
|
|
||||||
<%= header do %>
|
<%= header do %>
|
||||||
<%= link_to t("proposals.new.more_info"), help_path(anchor: "proposals"), title: t("shared.target_blank"), target: "_blank" %>
|
<%= new_window_link_to t("proposals.new.more_info"), help_path(anchor: "proposals") %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<aside>
|
<aside>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class Proposals::NewComponent < ApplicationComponent
|
class Proposals::NewComponent < ApplicationComponent
|
||||||
include Header
|
include Header
|
||||||
attr_reader :proposal
|
attr_reader :proposal
|
||||||
|
delegate :new_window_link_to, to: :helpers
|
||||||
|
|
||||||
def initialize(proposal)
|
def initialize(proposal)
|
||||||
@proposal = proposal
|
@proposal = proposal
|
||||||
|
|||||||
@@ -14,10 +14,8 @@
|
|||||||
<%= f.text_field :related_sdg_list,
|
<%= f.text_field :related_sdg_list,
|
||||||
class: "input",
|
class: "input",
|
||||||
hint: sanitize(t("sdg.related_list_selector.hint",
|
hint: sanitize(t("sdg.related_list_selector.hint",
|
||||||
link: link_to(t("sdg.related_list_selector.help.text"),
|
link: new_window_link_to(t("sdg.related_list_selector.help.text"),
|
||||||
sdg_help_path,
|
sdg_help_path)),
|
||||||
title: t("shared.target_blank"),
|
|
||||||
target: "_blank")),
|
|
||||||
attributes: %w[href title target]),
|
attributes: %w[href title target]),
|
||||||
data: { "suggestions-list": sdg_related_suggestions,
|
data: { "suggestions-list": sdg_related_suggestions,
|
||||||
"remove-tag-text": t("sdg.related_list_selector.remove_tag") } %>
|
"remove-tag-text": t("sdg.related_list_selector.remove_tag") } %>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
class SDG::RelatedListSelectorComponent < ApplicationComponent
|
class SDG::RelatedListSelectorComponent < ApplicationComponent
|
||||||
attr_reader :f
|
attr_reader :f
|
||||||
|
delegate :new_window_link_to, to: :helpers
|
||||||
|
|
||||||
def initialize(form)
|
def initialize(form)
|
||||||
@f = form
|
@f = form
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
class Shared::AgreeWithTermsOfServiceFieldComponent < ApplicationComponent
|
class Shared::AgreeWithTermsOfServiceFieldComponent < ApplicationComponent
|
||||||
attr_reader :form
|
attr_reader :form
|
||||||
|
delegate :new_window_link_to, to: :helpers
|
||||||
|
|
||||||
def initialize(form)
|
def initialize(form)
|
||||||
@form = form
|
@form = form
|
||||||
@@ -9,8 +10,7 @@ class Shared::AgreeWithTermsOfServiceFieldComponent < ApplicationComponent
|
|||||||
|
|
||||||
def label
|
def label
|
||||||
t("form.accept_terms",
|
t("form.accept_terms",
|
||||||
policy: link_to(t("form.policy"), "/privacy", target: "_blank", title: t("shared.target_blank")),
|
policy: new_window_link_to(t("form.policy"), "/privacy"),
|
||||||
conditions: link_to(t("form.conditions"), "/conditions", target: "_blank",
|
conditions: new_window_link_to(t("form.conditions"), "/conditions"))
|
||||||
title: t("shared.target_blank")))
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ module ApplicationHelper
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def new_window_link_to(text, path, **options)
|
||||||
|
link_to text, path, { target: "_blank", title: t("shared.target_blank") }.merge(options)
|
||||||
|
end
|
||||||
|
|
||||||
def image_path_for(filename)
|
def image_path_for(filename)
|
||||||
image = SiteCustomization::Image.image_for(filename)
|
image = SiteCustomization::Image.image_for(filename)
|
||||||
|
|
||||||
|
|||||||
@@ -26,10 +26,8 @@
|
|||||||
|
|
||||||
<%= f.check_box :terms_of_service,
|
<%= f.check_box :terms_of_service,
|
||||||
label: t("devise_views.users.registrations.new.terms",
|
label: t("devise_views.users.registrations.new.terms",
|
||||||
terms: link_to(t("devise_views.users.registrations.new.terms_link"),
|
terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
|
||||||
"/conditions",
|
"/conditions")) %>
|
||||||
title: t("shared.target_blank"),
|
|
||||||
target: "_blank")) %>
|
|
||||||
|
|
||||||
<div class="small-12 medium-6 small-centered">
|
<div class="small-12 medium-6 small-centered">
|
||||||
<%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
|
<%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
|
||||||
|
|||||||
@@ -36,10 +36,8 @@
|
|||||||
|
|
||||||
<%= f.check_box :terms_of_service,
|
<%= f.check_box :terms_of_service,
|
||||||
label: t("devise_views.users.registrations.new.terms",
|
label: t("devise_views.users.registrations.new.terms",
|
||||||
terms: link_to(t("devise_views.users.registrations.new.terms_link"),
|
terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
|
||||||
"/conditions",
|
"/conditions")) %>
|
||||||
title: t("shared.target_blank"),
|
|
||||||
target: "_blank")) %>
|
|
||||||
|
|
||||||
<div class="small-12 medium-6 small-centered">
|
<div class="small-12 medium-6 small-centered">
|
||||||
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
|
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
|
||||||
|
|||||||
@@ -70,10 +70,8 @@
|
|||||||
<div class="small-12">
|
<div class="small-12">
|
||||||
<%= f.check_box :terms_of_service,
|
<%= f.check_box :terms_of_service,
|
||||||
label: t("verification.residence.new.accept_terms_text",
|
label: t("verification.residence.new.accept_terms_text",
|
||||||
terms_url: link_to(t("verification.residence.new.terms"),
|
terms_url: new_window_link_to(t("verification.residence.new.terms"),
|
||||||
page_path("census_terms"),
|
page_path("census_terms"))) %>
|
||||||
title: t("shared.target_blank"),
|
|
||||||
target: "_blank")) %>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="small-12 medium-3 clear">
|
<div class="small-12 medium-3 clear">
|
||||||
|
|||||||
Reference in New Issue
Block a user