X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f18baae22e4088af7f252c82f3c4a2576862a438..dd29af0ec4adc05f1e6f6be0af0c23724492aef8:/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 947aafbf9..ffaad054a 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -7,13 +7,13 @@ <% end %>
-

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

+

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

<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %> - <%= hidden_field_tag("referer", h(params[:referer])) %> + <%= 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 => "users", :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 %> @@ -24,37 +24,32 @@
-
- - -
    -
  • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %>
  • - <% if Settings.key?(:google_auth_id) -%> -
  • <%= auth_button "google", "google" %>
  • - <% end -%> - <% if Settings.key?(:facebook_auth_id) -%> -
  • <%= auth_button "facebook", "facebook" %>
  • - <% end -%> - <% if Settings.key?(:windowslive_auth_id) -%> -
  • <%= auth_button "windowslive", "windowslive" %>
  • - <% end -%> - <% if Settings.key?(:github_auth_id) -%> -
  • <%= auth_button "github", "github" %>
  • - <% end -%> - <% if Settings.key?(:wikipedia_auth_id) -%> -
  • <%= auth_button "wikipedia", "wikipedia" %>
  • +
    + + +
      +
    • + <%= link_to image_tag("openid.png", + :alt => t(".auth_providers.openid.title"), + :size => "36"), + "#", + :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 -%> -
    • <%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %>
    • -
    • <%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %>
    • -
    • <%= auth_button "aol", "openid", :openid_url => "aol.com" %>
    <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> -
    - - <%= hidden_field_tag("referer", params[:referer]) %> - <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url form-control") %> - (" target="_new"><%= t "users.account.openid.link text" %>) +
    + + <%= 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" %>