X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ee3d678319062d4f2f27918d3f98d3465d9eb36..ca719af262380a906103e7aec9befb4c903693a1:/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 52e014442..c2d96b63c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -22,35 +22,33 @@ <% end %> -
- <% if @preferred_auth_provider %> - <%= render :partial => "auth_providers" %> - <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %> +<% 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"), :autofocus => true, :tabindex => 1, :value => params[:username] %> + <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %> -
- <%= 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.label :password, t(".password") %> + <%= 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.password_field :password, :autocomplete => "on", :tabindex => 2, :value => "", :skip_label => true %> -
- <%= f.primary t(".login_button"), :tabindex => 4 %> -
+ <%= f.form_group do %> + <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "true") }, "yes" %> <% end %> - <% unless @preferred_auth_provider %> - <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %> - <%= render :partial => "auth_providers" %> - <% 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 %>