X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae87d2ca7f602cd6005efb2ad41f2c580eb6406f..326d4ecec0ca0817567912f5d45b904df4c5b054:/app/views/application/_auth_providers.html.erb?ds=sidebyside

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 9c72d7aa0..3feda6139 100644
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,33 +1,45 @@
+<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
+
 <div>
-  <div class="mb-3">
-    <label class="form-label"><%= t ".with external" %></label>
+  <%= tag.div :id => "login_auth_buttons",
+              :class => ["collapse show row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>
 
-    <ul class='list-inline' id="login_auth_buttons">
-      <li class="list-inline-item me-3">
-        <%= link_to image_tag("openid.png",
-                              :alt => t("application.auth_providers.openid.title"),
-                              :size => "36"),
-                    "#",
-                    :id => "openid_open_url",
-                    :title => t("application.auth_providers.openid.title") %>
-      </li>
+    <% if prefered_auth_button_available %>
+      <div class="col justify-content-center d-flex align-items-center flex-wrap">
+        <%= auth_button_preferred @preferred_auth_provider %>
+      </div>
+    <% end %>
 
-      <% %w[google facebook microsoft github wikipedia].each do |provider| %>
-        <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
-          <li class="list-inline-item me-3"><%= auth_button provider, provider %></li>
+    <div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
+      <% Auth.providers.each_value do |provider| %>
+        <% if provider == "openid" %>
+          <%= button_tag image_tag("auth_providers/openid.svg",
+                                   :alt => t(".openid.alt"),
+                                   :size => "36"),
+                         :type => "button",
+                         :data => { "bs-toggle" => "collapse",
+                                    "bs-target" => "#login_auth_buttons, #openid_login_form" },
+                         :title => t(".openid.title"),
+                         :class => "btn btn-outline-secondary border p-2" %>
+        <% elsif provider != @preferred_auth_provider %>
+          <%= auth_button provider %>
         <% end -%>
       <% end -%>
-    </ul>
+    </div>
+  <% end %>
 
-    <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
-      <div id='login_openid_url' class="mb-3">
-        <label for='openid_url' class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
-        <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
-        <%= text_field_tag("openid_url", "", :tabindex => 5, :autocomplete => "on", :class => "openid_url form-control") %>
-        <span class="form-text text-muted">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
-      </div>
+  <%# :tabindex starts high to allow rendering at the bottom of the template %>
+  <%= 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 "auth_providers/openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
+        <%= t ".openid_url" %>
+      </label>
+      <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
+      <%= text_field_tag("openid_url", "https://", :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>
+    </div>
 
-      <%= submit_tag t(".openid_login_button"), :tabindex => 6, :id => "openid_login_button", :class => "btn btn-primary" %>
-    <% end %>
-  </div>
+    <%= submit_tag t(".openid_login_button"), :tabindex => 21, :class => "btn btn-primary" %>
+  <% end %>
 </div>