X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d4344da2beeff6ed657c1a9970573acdad8563eb..392d3d12264c83d7ab03d34471792476fac31cf6:/app/views/application/_auth_providers.html.erb diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb index 66417bca2..96a20fd85 100644 --- a/app/views/application/_auth_providers.html.erb +++ b/app/views/application/_auth_providers.html.erb @@ -1,17 +1,18 @@ -
-
+<% 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 = 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 -%> +
+ <%= tag.div :id => "login_auth_buttons", + :class => ["row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %> <% 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 %> @@ -20,18 +21,16 @@ <% end -%> <% end -%>
-
- <% else %> -
<% end %> - <%= link_to image_tag("openid.svg", - :alt => t("application.auth_providers.openid.alt"), - :size => "36"), - "#", - :id => "openid_open_url", - :title => t("application.auth_providers.openid.title"), - :class => "btn btn-light mx-1 p-2 d-block" %> +
+ <%= 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 %> @@ -41,17 +40,20 @@ <% end %> <% end -%>
-
+ <% end %> <%# :tabindex starts high to allow rendering at the bottom of the template %> <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> -
- +
+ <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %> - <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "openid_url form-control") %> + <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "form-control") %> (" target="_new"><%= t "accounts.edit.openid.link text" %>)
- <%= submit_tag t(".openid_login_button"), :tabindex => 21, :id => "openid_login_button", :class => "btn btn-primary" %> + <%= submit_tag t(".openid_login_button"), :tabindex => 21, :class => "btn btn-primary" %> <% end %>