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

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-03 19:29:28 +00:00
commit c8c13e7d00
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/accounts/edit.html.erb
View file

@ -19,7 +19,11 @@
<fieldset class="mb-3">
<label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
<div class="row">
<%= f.select(:auth_provider, { t("auth.providers.none") => "" }.merge(Auth.providers), :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
<%= f.select :auth_provider,
Auth.providers.map { |provider| [I18n.t("auth.providers.#{provider}"), provider] },
:include_blank => t("auth.providers.none"),
:hide_label => true,
:wrapper => { :class => "col-auto mb-0" } %>
<%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
</div>
<small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>

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

@ -1,4 +1,4 @@
<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.include?(@preferred_auth_provider) %>
<div>
<%= tag.div :id => "login_auth_buttons",
@ -11,7 +11,7 @@
<% end %>
<div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
<% Auth.providers.each_value do |provider| %>
<% Auth.providers.each do |provider| %>
<% if provider == "openid" %>
<%= button_tag image_tag("auth_providers/openid.svg",
:alt => t(".openid.alt"),