X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f18baae22e4088af7f252c82f3c4a2576862a438..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/app/views/sessions/new.html.erb?ds=inline
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 947aafbf9..c2d96b63c 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,64 +1,54 @@
<% content_for :head do %>
<%= javascript_include_tag "login" %>
+ <%= javascript_include_tag "auth_providers" %>
<% end %>
+<% content_for :heading_class, "pb-0" %>
+
<% content_for :heading do %>
-
-
<%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %>
+
+
+ -
+ <%= link_to t("sessions.new.tab_title"), "#", :class => "nav-link active" %>
+
+ -
+ <%= link_to t("users.new.tab_title"), url_for(:action => :new, :controller => :users, :referer => params[:referer]), :class => "nav-link" %>
+
+
+
+<% end %>
- <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
- <%= hidden_field_tag("referer", h(params[:referer])) %>
+<% if @preferred_auth_provider %>
+ <%= render :partial => "auth_providers" %>
+ <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
+<% end %>
- <%= 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 => "users", :action => "lost_password") %>
- <%= f.form_group do %>
- <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
- <% end %>
+<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
+ <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
- <%= f.primary t(".login_button"), :tabindex => 4 %>
- <% end %>
+ <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %>
-
-
-
+<% end %>
+
+<% unless @preferred_auth_provider %>
+ <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %>
+ <%= render :partial => "auth_providers" %>
+<% end %>