X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/403121334af3140667709e25fdb8fd6fbac53735..76559d3de23b3af28b6d2014d12ed48d0cfc74cd:/app/views/user/login.html.erb?ds=inline diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 1cdb8511f..c2deada5c 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,86 +1,78 @@ -

<%= 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]) %>

+
+<% content_for :heading do %> +

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

+<% end %> -<% form_tag({ :action => "login" }, { :id => "login_form" }) 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' %>

- - - - - - - - - - - - - - - - - -
<%= text_field_tag("username", "", { :size => 28, :maxlength => 255, :tabindex => 1 }) %>
<%= 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 %>
+

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

- <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> -
+ + + + + + + + + + + +
<%= 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 => 4 %> +
+

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

-
-
+ -
-

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

-
- <%= - link_to_function(image_tag("openid_large.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[:openid_buttons].hide - page[:openid_url].show - page[:openid_url_hint].show - page[:openid_submit].show - page[:remember_me_label].removeClassName("nowrap") - 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" %> -
+ + + + + + + + + +
+ <%= 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 %>
- - - - - - - - - - - - - -
- <%= t 'user.login.openid', :logo => openid_logo %> - <%= text_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 %> - <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %> -
-
-<% end %> +
+ +