Merge remote-tracking branch 'upstream/pull/4943'

[rails.git] / app / views / sessions / new.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index acbf8dab01d22bdc3ede7082ca0fe3155ce7f22d..162ea542ea8be5d3477e5e9d202f21629e0ad7cf 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -25,27 +25,20 @@
 <div id="login_login" class="auth-container mx-auto my-0">
   <% if @preferred_auth_provider %>
     <%= render :partial => "auth_providers" %>
 <div id="login_login" class="auth-container mx-auto my-0">
   <% if @preferred_auth_provider %>
     <%= render :partial => "auth_providers" %>

-    <div class="d-flex justify-content-center align-items-center">
-      <div class="border-bottom border-1 flex-grow-1"></div>
-      <div class="text-secondary mx-3"><%= t ".or" %></div>
-      <div class="border-bottom border-1 flex-grow-1"></div>
-    </div>
-  <% end %>
+    <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
+<% end %>

 
   <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
     <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
 
     <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %>
 
 
   <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
     <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
 
     <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %>
 

-    <div class="row">
-      <div class="col">
-        <%= f.label :password, :class => "form-label" %>
-      </div>
-      <div class="col text-end">
-        <small><%= link_to(t(".lost password link"), user_forgot_password_path) %></small>
-      </div>
+    <div class="d-flex flex-wrap column-gap-3 justify-content-between align-items-baseline mb-2">
+      <%= f.label :password, t(".password") %>
+      <small><%= link_to(t(".lost password link"), user_forgot_password_path) %></small>

     </div>
     </div>

-    <input class="form-control mb-3" type="password" name="password" id="password" tabindex="2" value="" autocomplete="off" />
+
+    <%= f.password_field :password, :autocomplete => "on", :tabindex => 2, :value => "", :skip_label => true %>

 
     <%= f.form_group do %>
       <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
 
     <%= f.form_group do %>
       <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>


@@ -57,11 +50,7 @@
   <% end %>
 
   <% unless @preferred_auth_provider %>
   <% end %>
 
   <% unless @preferred_auth_provider %>

-    <div class="d-flex justify-content-center align-items-center">
-      <div class="border-bottom border-1 flex-grow-1"></div>
-      <div class="text-secondary mx-3"><%= t ".with external" %></div>
-      <div class="border-bottom border-1 flex-grow-1"></div>
-    </div>
+    <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %>

     <%= render :partial => "auth_providers" %>
   <% end %>
 </div>
     <%= render :partial => "auth_providers" %>
   <% end %>
 </div>