X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2acf8cb8f22deb2e2960c99c0eeb8c5d64533c9e..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/app/views/sessions/new.html.erb?ds=sidebyside diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index f15430efa..c2d96b63c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,51 +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 ".heading" %>

+ <% if @client_app_name %> +

<%= t(".login_to_authorize_html", :client_app_name => @client_app_name) %>

+ <% end %> + +
+ +
<% end %> -
-

<%= t ".no account" %> <%= link_to t(".register now"), user_new_path(:referer => params[:referer]) %>

+<% if @preferred_auth_provider %> + <%= render :partial => "auth_providers" %> + <%= 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") %> +<%= 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"), :tabindex => 1, :value => params[:username] %> - <%= 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 %> + <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %> - <%= f.primary t(".login_button"), :tabindex => 4 %> +
+ <%= f.label :password, t(".password") %> + <%= link_to(t(".lost password link"), user_forgot_password_path) %> +
+ + <%= 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] == "true") }, "yes" %> <% end %> -
- -
-
- - -
    -
  • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".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 -%> - <% 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" %>) -
- - <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %> - <% end %> -
+
+ <%= f.primary t(".login_button"), :tabindex => 4 %>
-
+<% end %> + +<% unless @preferred_auth_provider %> + <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %> + <%= render :partial => "auth_providers" %> +<% end %>