X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae87d2ca7f602cd6005efb2ad41f2c580eb6406f..b057c7ae5aa66291b0f4be7ca08dd9082f18bfae:/app/views/application/_auth_providers.html.erb?ds=inline diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb index 9c72d7aa0..12f8c4d7d 100644 --- a/app/views/application/_auth_providers.html.erb +++ b/app/views/application/_auth_providers.html.erb @@ -1,33 +1,57 @@
-
- +
-
    -
  • - <%= 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") %> -
  • - - <% %w[google facebook microsoft github wikipedia].each do |provider| %> - <% if Settings.key?("#{provider}_auth_id".to_sym) -%> -
  • <%= auth_button provider, provider %>
  • - <% 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 -%> - <%= 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 => 5, :autocomplete => "on", :class => "openid_url form-control") %> - (" target="_new"><%= t "accounts.edit.openid.link text" %>) + <% 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 -%>
- - <%= submit_tag t(".openid_login_button"), :tabindex => 6, :id => "openid_login_button", :class => "btn btn-primary" %> +
+ <% else %> +
<% end %> + + <%= 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"), + :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 %> + <% 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") %> + (" target="_new"><%= t "accounts.edit.openid.link text" %>) +
+ + <%= submit_tag t(".openid_login_button"), :tabindex => 21, :id => "openid_login_button", :class => "btn btn-primary" %> + <% end %>