X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d70fd8ab1a07d842603b820d8ce7d0e5be9f976d..e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 9a4f50abc..21705e358 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,80 +1,88 @@ -
- -
-

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

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

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

- - - - - -
<%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %>
<%= t 'user.login.password' %><%= password_field_tag "password", "", :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 => 3 %> - -
- -

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

- - - - - - - - - - -
- <%= - link_to_function(image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page| - page[:login_form][:openid_url].value = "http://" - page[:login_openid_buttons].hide - page[:login_openid_url].show - page[:login_openid_submit].show - end - %> - <%= openid_button "google", "gmail.com" %><%= openid_button "yahoo", "me.yahoo.com" %><%= openid_button "myopenid", "myopenid.com" %><%= openid_button "wordpress", "wordpress.com" %><%= openid_button "aol", "aol.com" %>
- - - - - - - - - - -
- <%= raw t 'user.login.openid', :logo => openid_logo %> - - <%= url_field_tag("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 => "login_openid_submit" %> - <% end %> - -
-
- -
-

<%= t 'user.login.new to osm' %>

-

<%= t 'user.login.to make changes' %>

-

<%= t 'user.login.create account minute' %>

-

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

- -
-
+<% content_for :head do %> + <%= javascript_include_tag "login" %> +<% end %> -
+<% content_for :heading do %> +

<%= t '.heading' %>

+<% end %> + +
+ <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> + <%= hidden_field_tag('referer', h(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 => 'user', :action => 'lost_password' %> + +
+ +
+ <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> + + <%= submit_tag t('.login_button'), :tabindex => 4 %> +
+ +
+ +

<%= t '.with external' %>

-<%= - update_page_tag do |page| - page[:login_openid_url].hide - page[:login_openid_submit].hide - end -%> +
    +
  • <%= 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) -%> +
  • <%= 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 -%> + <% if defined?(WIKIPEDIA_AUTH_ID) -%> +
  • <%= auth_button "wikipedia", "wikipedia" %>
    • + <% 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('.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + +
+ +
+ + <% end %> + +