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

Merge remote-tracking branch 'upstream/pull/4967'

Browse source
This commit is contained in:
Tom Hughes 2024-07-09 18:46:15 +01:00
commit aa2a9249db
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/user_helper.rb
View file

@ -64,7 +64,7 @@ module UserHelper
: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 d-block", :class => "auth_button btn btn-light p-2",
:title => t("application.auth_providers.#{name}.title") :title => t("application.auth_providers.#{name}.title")
) )
end end

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

@ -1,5 +1,5 @@
<div> <div>
<div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-100 mb-3" id="login_auth_buttons"> <div class="justify-content-center d-flex align-items-center flex-wrap mb-3" id="login_auth_buttons">
<% prefered_auth_button_available = false %> <% prefered_auth_button_available = false %>
<% %w[google facebook microsoft github wikipedia].each do |provider| %> <% %w[google facebook microsoft github wikipedia].each do |provider| %>
@ -11,7 +11,7 @@
<% end -%> <% end -%>
<% if prefered_auth_button_available %> <% if prefered_auth_button_available %>
<div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-50"> <div class="justify-content-center d-flex align-items-center flex-wrap w-50">
<% %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 %>
@ -20,9 +20,9 @@
<% end -%> <% end -%>
<% end -%> <% end -%>
</div> </div>
<div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1"> <div class="justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1">
<% else %> <% else %>
<div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-100"> <div class="justify-content-center d-flex align-items-center flex-wrap gap-2">
<% end %> <% end %>
<%= link_to image_tag("openid.svg", <%= link_to image_tag("openid.svg",
@ -31,7 +31,7 @@
"#", "#",
:id => "openid_open_url", :id => "openid_open_url",
:title => t("application.auth_providers.openid.title"), :title => t("application.auth_providers.openid.title"),
:class => "btn btn-light p-2 d-block" %> :class => "btn btn-light p-2" %>
<% %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 %>
@ -48,7 +48,7 @@
<div id="login_openid_url" class="mb-3"> <div id="login_openid_url" class="mb-3">
<label for="openid_url" class="form-label"><%= t ".openid_html", :logo => openid_logo %></label> <label for="openid_url" class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
<%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %> <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
<%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "openid_url form-control") %> <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "form-control") %>
<span class="form-text text-body-secondary">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span> <span class="form-text text-body-secondary">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
</div> </div>

2
test/helpers/user_helper_test.rb
View file

@ -117,7 +117,7 @@ class UserHelperTest < ActionView::TestCase
def test_auth_button def test_auth_button
button = auth_button("google", "google") button = auth_button("google", "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 d-block\" 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
private private