X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4..ebd109c946d71b3ccc616ea3966e56ae019638d7:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 16d820b69..31379e03e 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,21 +1,56 @@ -

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

+

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

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

+
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
 
<%= submit_tag t('user.login.login_button'), :tabindex => 3 %>

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

+ + + +
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %>
(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
+ +
+
+
+

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

+ + + + + + + + + +
+ <%= 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' %>) + +
+ <%= + 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://" + 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" %> +
-<%= t 'user.login.openid description' %>         (<%= t 'user.account.openid.link text' %>) - -<%= t 'user.login.openid' %><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %> -  -<%= submit_tag t('user.login.login_button'), :tabindex => 3 %> - +
+ + +
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
+
+ <% end %>