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

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

Browse source
This commit is contained in:
Tom Hughes 2024-07-20 12:02:03 +01:00
commit fee09d5153
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/auth_providers.js
View file

@ -7,13 +7,4 @@ $(document).ready(function () {
params.referer = $("#referer").val();
this.search = Qs.stringify(params);
});
// Add click handler to show OpenID field
$("#openid_open_url").click(function () {
$("#login_auth_buttons").hide();
$("#openid_login_form").show();
});
// Hide OpenID field for now
$("#openid_login_form").hide();
});

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

@ -2,7 +2,7 @@
<div>
<%= tag.div :id => "login_auth_buttons",
:class => ["row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>
:class => ["collapse show row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>
<% if prefered_auth_button_available %>
<div class="col justify-content-center d-flex align-items-center flex-wrap">
@ -17,7 +17,8 @@
:alt => t(".openid.alt"),
:size => "36"),
:type => "button",
:id => "openid_open_url",
:data => { "bs-toggle" => "collapse",
"bs-target" => "#login_auth_buttons, #openid_login_form" },
:title => t(".openid.title"),
:class => "btn btn-light p-2" %>
<% elsif provider != @preferred_auth_provider %>
@ -28,7 +29,7 @@
<% end %>
<%# :tabindex starts high to allow rendering at the bottom of the template %>
<%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
<%= form_tag auth_path(:provider => "openid"), :id => "openid_login_form", :class => "collapse" do %>
<div class="mb-3">
<label for="openid_url" class="form-label">
<%= image_tag "openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>