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

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

Browse source
This commit is contained in:
Tom Hughes 2024-07-18 17:21:25 +01:00
commit 1e8e7e41f7
3 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
<fieldset class="mb-3">
<label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
<div class="row">
<%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
<%= f.select(:auth_provider, { t("auth.providers.none") => "" }.merge(Auth.providers), :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>

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

@ -1,11 +1,4 @@
<% prefered_auth_button_available = false %>
<% %w[google facebook microsoft github wikipedia].each do |provider| %>
<% if Settings.key?("#{provider}_auth_id".to_sym) -%>
<% if @preferred_auth_provider == provider %>
<% prefered_auth_button_available = true %>
<% end %>
<% end -%>
<% end -%>
<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
<div>
<%= tag.div :id => "login_auth_buttons",
@ -18,20 +11,18 @@
<% end %>
<div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
<%= button_tag image_tag("openid.svg",
:alt => t(".openid.alt"),
:size => "36"),
:type => "button",
:id => "openid_open_url",
:title => t(".openid.title"),
:class => "btn btn-light p-2" %>
<% %w[google facebook microsoft github wikipedia].each do |provider| %>
<% unless @preferred_auth_provider == provider %>
<% if Settings.key?("#{provider}_auth_id".to_sym) -%>
<%= auth_button provider %>
<% end -%>
<% end %>
<% Auth.providers.each_value do |provider| %>
<% if provider == "openid" %>
<%= button_tag image_tag("openid.svg",
:alt => t(".openid.alt"),
:size => "36"),
:type => "button",
:id => "openid_open_url",
:title => t(".openid.title"),
:class => "btn btn-light p-2" %>
<% elsif provider != @preferred_auth_provider %>
<%= auth_button provider %>
<% end -%>
<% end -%>
</div>
<% end %>