<%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
<%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %>
- <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "passwords", :action => "lost_password") %>
+ <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), user_forgot_password_path) %>
<%= f.form_group do %>
<%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
<% end %>
<hr>
<div id="loginForm">
- <div class="form-group">
+ <div class="mb-3">
<label class="form-label"><%= t ".with external" %></label>
- <ul class='list-unstyled' id="login_auth_buttons">
- <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
- <% if Settings.key?(:google_auth_id) -%>
- <li><%= auth_button "google", "google" %></li>
- <% end -%>
- <% if Settings.key?(:facebook_auth_id) -%>
- <li><%= auth_button "facebook", "facebook" %></li>
- <% end -%>
- <% if Settings.key?(:windowslive_auth_id) -%>
- <li><%= auth_button "windowslive", "windowslive" %></li>
- <% end -%>
- <% if Settings.key?(:github_auth_id) -%>
- <li><%= auth_button "github", "github" %></li>
- <% end -%>
- <% if Settings.key?(:wikipedia_auth_id) -%>
- <li><%= auth_button "wikipedia", "wikipedia" %></li>
+ <ul class='list-inline' id="login_auth_buttons">
+ <li class="list-inline-item me-3"><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
+ <% %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>
+ <% end -%>
<% end -%>
</ul>
<%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
- <div id='login_openid_url' class="form-group">
+ <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 => 3, :autocomplete => "on", :class => "openid_url form-control") %>