From 1d35daa0b5867e3834db5b6a2056819dafbe167a Mon Sep 17 00:00:00 2001 From: Nenad Vujicic Date: Mon, 27 May 2024 15:21:15 +0200 Subject: [PATCH] Fixed "auth_button_preferred alignment" issue described in #4773 --- .../application/_auth_providers.html.erb | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb index 554ec8dda..0cbb529a5 100644 --- a/app/views/application/_auth_providers.html.erb +++ b/app/views/application/_auth_providers.html.erb @@ -1,29 +1,42 @@
-
+
+ <% 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 %> -
<%= auth_button_preferred provider, provider %>
+ <% prefered_auth_button_available = true %> <% end %> <% end -%> <% end -%> -
-
- <%= link_to image_tag("openid.png", - :alt => t("application.auth_providers.openid.title"), - :size => "24"), - "#", - :id => "openid_open_url", - :title => t("application.auth_providers.openid.title"), - :class => "p-2 d-block" %> + <% if prefered_auth_button_available %> +
+ <% %w[google facebook microsoft github wikipedia].each do |provider| %> + <% if Settings.key?("#{provider}_auth_id".to_sym) -%> + <% if @preferred_auth_provider == provider %> + <%= auth_button_preferred provider, provider %> + <% end %> + <% end -%> + <% end -%>
+
+ <% else %> +
+ <% end %> + + <%= link_to image_tag("openid.png", + :alt => t("application.auth_providers.openid.title"), + :size => "24"), + "#", + :id => "openid_open_url", + :title => t("application.auth_providers.openid.title"), + :class => "p-2 d-block" %> <% %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, provider %>
+ <%= auth_button provider, provider %> <% end -%> <% end %> <% end -%> -- 2.39.5