cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove name parameter from auth button helpers

Browse source
This commit is contained in:
Anton Khorev 2024-07-16 17:12:17 +03:00
parent 4a62dac9c0
commit b0e41cf142
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/helpers/user_helper.rb
View file

@ -52,29 +52,29 @@ module UserHelper
# External authentication support # External authentication support
def auth_button(name, provider, options = {}) def auth_button(provider, options = {})
link_to( link_to(
image_tag("#{name}.svg", image_tag("#{provider}.svg",
:alt => t("application.auth_providers.#{name}.alt"), :alt => t("application.auth_providers.#{provider}.alt"),
:class => "rounded-1", :class => "rounded-1",
:size => "36"), :size => "36"),
auth_path(options.merge(:provider => provider)), auth_path(options.merge(:provider => provider)),
:method => :post, :method => :post,
:class => "auth_button btn btn-light p-2", :class => "auth_button btn btn-light p-2",
:title => t("application.auth_providers.#{name}.title") :title => t("application.auth_providers.#{provider}.title")
) )
end end
def auth_button_preferred(name, provider, options = {}) def auth_button_preferred(provider, options = {})
link_to( link_to(
image_tag("#{name}.svg", image_tag("#{provider}.svg",
:alt => t("application.auth_providers.#{name}.alt"), :alt => t("application.auth_providers.#{provider}.alt"),
:class => "rounded-1 me-3", :class => "rounded-1 me-3",
:size => "36") + t("application.auth_providers.#{name}.title"), :size => "36") + t("application.auth_providers.#{provider}.title"),
auth_path(options.merge(:provider => provider)), auth_path(options.merge(:provider => provider)),
:method => :post, :method => :post,
:class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center", :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center",
:title => t("application.auth_providers.#{name}.title") :title => t("application.auth_providers.#{provider}.title")
) )
end end

4
app/views/application/_auth_providers.html.erb
View file

@ -16,7 +16,7 @@
<% %w[google facebook microsoft github wikipedia].each do |provider| %> <% %w[google facebook microsoft github wikipedia].each do |provider| %>
<% if Settings.key?("#{provider}_auth_id".to_sym) -%> <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
<% if @preferred_auth_provider == provider %> <% if @preferred_auth_provider == provider %>
<%= auth_button_preferred provider, provider %> <%= auth_button_preferred provider %>
<% end %> <% end %>
<% end -%> <% end -%>
<% end -%> <% end -%>
@ -35,7 +35,7 @@
<% %w[google facebook microsoft github wikipedia].each do |provider| %> <% %w[google facebook microsoft github wikipedia].each do |provider| %>
<% unless @preferred_auth_provider == provider %> <% unless @preferred_auth_provider == provider %>
<% if Settings.key?("#{provider}_auth_id".to_sym) -%> <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
<%= auth_button provider, provider %> <%= auth_button provider %>
<% end -%> <% end -%>
<% end %> <% end %>
<% end -%> <% end -%>

2
test/helpers/user_helper_test.rb
View file

@ -110,7 +110,7 @@ class UserHelperTest < ActionView::TestCase
end end
def test_auth_button def test_auth_button
button = auth_button("google", "google") button = auth_button("google")
img_tag = "<img alt=\"Google logo\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />" img_tag = "<img alt=\"Google logo\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
assert_equal("<a class=\"auth_button btn btn-light p-2\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button) assert_equal("<a class=\"auth_button btn btn-light p-2\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
end end