Extract links to signin and signup to methods

This commit is contained in:
Javi Martín
2019-10-01 23:11:08 +02:00
parent 9289a051c3
commit f8bd3d4f39
14 changed files with 25 additions and 33 deletions

View File

@@ -4,4 +4,12 @@ module LinksHelper
t("links.form.delete_button"),
builder, class: "delete remove-element"
end
def link_to_signin(options = {})
link_to t("users.signin"), new_user_session_path, options
end
def link_to_signup(options = {})
link_to t("users.signup"), new_user_registration_path, options
end
end

View File

@@ -44,9 +44,7 @@
<% else %>
<div class="callout primary margin-top">
<%= t("budgets.investments.index.sidebar.not_logged_in",
sign_in: link_to(t("users.signin"), new_user_session_path),
sign_up: link_to(t("users.signup"), new_user_registration_path)
).html_safe %>
sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
</div>
<% end %>
<% end %>

View File

@@ -44,8 +44,6 @@
<div class="js-participation-not-allowed participation-not-allowed" style="display:none">
<% verify_account = link_to(t("users.verify_account"), verification_path) %>
<% signin = link_to(t("users.signin"), new_user_session_path) %>
<% signup = link_to(t("users.signup"), new_user_registration_path) %>
<% my_heading = link_to(investment.heading.name,
budget_investments_path(budget_id: investment.budget_id,
heading_id: investment.heading_id)) %>
@@ -55,8 +53,8 @@
<p>
<small>
<%= t("budgets.ballots.reasons_for_not_balloting.#{reason}",
verify_account: verify_account, signin: signin,
signup: signup, my_heading: my_heading,
verify_account: verify_account, signin: link_to_signin,
signup: link_to_signup, my_heading: my_heading,
change_ballot: change_ballot,
heading_link: heading_link(@assigned_heading, @budget)).html_safe %>
</small>

View File

@@ -34,8 +34,8 @@
<%= t("votes.budget_investments.#{reason}",
count: investment.group.max_votable_headings,
verify_account: link_to(t("users.verify_account"), verification_path),
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path),
signin: link_to_signin,
signup: link_to_signup,
supported_headings: (current_user && current_user.headings_voted_within_group(investment.group).map(&:name).sort.to_sentence)
).html_safe %>
</small>

View File

@@ -30,8 +30,7 @@
<% else %>
<div class="callout primary margin-top">
<%= t("budgets.investments.index.sidebar.not_logged_in",
sign_in: link_to(t("users.signin"), new_user_session_path),
sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
</div>
<% end %>
<% end %>

View File

@@ -82,8 +82,8 @@
<div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("votes.comment_unauthenticated",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
signin: link_to_signin,
signup: link_to_signup).html_safe %>
</div>
<% end %>
</div>

View File

@@ -10,8 +10,7 @@
<div class="callout primary">
<p>
<%= t("users.login_to_continue",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
signin: link_to_signin, signup: link_to_signup).html_safe %>
</p>
</div>
<% elsif not @receiver.email_on_direct_message? %>

View File

@@ -35,8 +35,7 @@
<div>
<div class="participation-not-allowed" style="display: none;" aria-hidden="false">
<%= t("users.login_to_comment",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
signin: link_to_signin, signup: link_to_signup).html_safe %>
</div>
</div>

View File

@@ -12,8 +12,7 @@
<% else %>
<p>
<%= t("annotator.help.text",
sign_in: link_to(t("users.signin"), new_user_session_path),
sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
</p>
<% end %>

View File

@@ -14,8 +14,7 @@
<% elsif !user_signed_in? %>
<div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("legislation.questions.participation.unauthenticated",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
signin: link_to_signin, signup: link_to_signup).html_safe %>
</div>
<% elsif !@process.debate_phase.open? %>
<div class="participation-not-allowed" style="display:none" aria-hidden="false">

View File

@@ -2,8 +2,8 @@
<% if current_user.nil? %>
<div class="callout primary">
<%= t("polls.show.cant_answer_not_logged_in",
signin: link_to(t("users.signin"), new_user_session_path, class: "probe-message"),
signup: link_to(t("users.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
signin: link_to_signin(class: "probe-message"),
signup: link_to_signup(class: "probe-message")).html_safe %>
</div>
<% elsif current_user.unverified? %>
<div class="callout warning">

View File

@@ -1,6 +1,3 @@
<div data-alert class="callout primary">
<%= t("users.login_to_comment",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)
).html_safe %>
<%= t("users.login_to_comment", signin: link_to_signin, signup: link_to_signup).html_safe %>
</div>

View File

@@ -1,6 +1,3 @@
<div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("users.login_to_continue",
signin: link_to(t("users.signin"), new_user_session_path),
signup: link_to(t("users.signup"), new_user_registration_path)
).html_safe %>
<%= t("users.login_to_continue", signin: link_to_signin, signup: link_to_signup).html_safe %>
</div>

View File

@@ -7,7 +7,6 @@
<% else %>
<div class="callout primary">
<%= t("community.show.create_first_community_topic.sub_first_theme",
sign_in: link_to(t("users.signin"), new_user_session_path),
sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
</div>
<% end %>