X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59a6b1973b92c91c987496410427d9a3be76e7e6..84d602c33411fedc8cb3594932ff9d9c110516ff:/app/views/user/login.html.erb?ds=sidebyside diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 37b852a52..3d28a770a 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,86 +1,85 @@ -

<%= t 'user.login.heading' %>

- -

<%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %>

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

<%= t 'user.login.username_heading' %>

- - - - - - - - - - - - - - - - - -
<%= text_field(:user, :email, { :value => "", :size => 28, :maxlength => 255, :tabindex => 1 }) %>
<%= password_field(:user, :password, { :value => "", :size => 28, :maxlength => 255, :tabindex => 2 }) %>
(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
- - <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> -
+<% content_for :head do %> + <%= javascript_include_tag "login" %> +<% end %> -
-
+<% content_for :heading do %> +

<%= t 'user.login.heading' %>

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

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

+ +
+ +
+
+ + <%= text_field_tag "username", params[:username], :tabindex => 1 %> +
+
+ + <%= password_field_tag "password", "", :tabindex => 2 %> +
+ + <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %> + +
+ +
+ <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> + + <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> +
+ +
+ +

<%= t 'user.login.with external' %>

+ +
    +
  • <%= link_to image_tag("openid.png", :alt => t("user.login.auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.auth_providers.openid.title") %>
    • + <% if defined?(GOOGLE_AUTH_ID) -%> +
  • <%= auth_button "google", "google" %>
    • + <% end -%> + <% if defined?(FACEBOOK_AUTH_ID) -%> +
  • <%= auth_button "facebook", "facebook" %>
    • + <% end -%> + <% if defined?(WINDOWSLIVE_AUTH_ID) -%> +
  • <%= auth_button "windowslive", "windowslive" %>
    • + <% end -%> + <% if defined?(GITHUB_AUTH_ID) -%> +
  • <%= auth_button "github", "github" %>
    • + <% 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" %>
    • +
+ +
+ + <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> + (<%= t 'user.account.openid.link text' %>) +
+ +
+ <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> + +
+ + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + +
-
-

<%= t 'user.login.openid_heading' %>

-
- <%= - link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page| - page[:login_form][:user_openid_url].value = "http://" - page[:openid_buttons].hide - page[:openid_url].show - page[:openid_url_hint].show - page[:openid_submit].show - end - %> - <%= openid_button "yahoo", "yahoo.com" %> - <%= openid_button "google", "gmail.com" %> - <%= openid_button "myopenid", "myopenid.com" %> - <%= openid_button "wordpress", "wordpress.com" %> - <%= openid_button "myspace", "myspace.com" %> -
- - - - - - - - - - - - - - -
- <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %> - <%= t 'user.login.openid' %> - <%= text_field(:user, :openid_url, { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
- (<%= t 'user.account.openid.link text' %>) -
<%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
- - <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %>
-
-<% end %> -<%= - update_page_tag do |page| - page[:openid_url].hide - page[:openid_url_hint].hide - page[:openid_submit].hide - end -%> + <% end %> + +