X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/083500f056f5b995f1979f88b37793046d9e4d37..3159c3c3f715250ef97e468eb155b868322b0426:/app/views/users/login.html.erb?ds=sidebyside diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb index 0944d7809..9bfa23cbc 100644 --- a/app/views/users/login.html.erb +++ b/app/views/users/login.html.erb @@ -3,62 +3,69 @@ <% end %> <% content_for :heading do %> -

<%= t '.heading' %>

+

<%= t ".heading" %>

<% end %>
<%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> - <%= hidden_field_tag('referer', h(params[:referer])) %> + <%= hidden_field_tag("referer", h(params[:referer])) %> -

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

+

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

<%= text_field_tag "username", params[:username], :tabindex => 1 %>
<%= password_field_tag "password", "", :tabindex => 2 %>
- <%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %> + <%= link_to t(".lost password link"), :controller => "users", :action => "lost_password" %>
<%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> - <%= submit_tag t('.login_button'), :tabindex => 4 %> + <%= submit_tag t(".login_button"), :tabindex => 4 %>
+
+ + <% end %> + + <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> +
+
-

<%= t '.with external' %>

+

<%= t ".with external" %>

  • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %>
  • - <% if defined?(GOOGLE_AUTH_ID) -%> + <% if Settings.key?(:google_auth_id) -%>
  • <%= auth_button "google", "google" %>
  • <% end -%> - <% if defined?(FACEBOOK_AUTH_ID) -%> + <% if Settings.key?(:facebook_auth_id) -%>
  • <%= auth_button "facebook", "facebook" %>
  • <% end -%> - <% if defined?(WINDOWSLIVE_AUTH_ID) -%> + <% if Settings.key?(:windowslive_auth_id) -%>
  • <%= auth_button "windowslive", "windowslive" %>
  • <% end -%> - <% if defined?(GITHUB_AUTH_ID) -%> + <% if Settings.key?(:github_auth_id) -%>
  • <%= auth_button "github", "github" %>
  • <% end -%> - <% if defined?(WIKIPEDIA_AUTH_ID) -%> + <% if Settings.key?(:wikipedia_auth_id) -%>
  • <%= auth_button "wikipedia", "wikipedia" %>
  • <% end -%>
  • <%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %>
  • @@ -67,17 +74,13 @@
- - <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> - (<%= t 'users.account.openid.link text' %>) -
- -
- <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> - + + <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %> + <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %> + (" target="_new"><%= t "users.account.openid.link text" %>)
- <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>