X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..76559d3de23b3af28b6d2014d12ed48d0cfc74cd:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 5208d0a7f..c2deada5c 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,67 +1,61 @@ -
<%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>
+<%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>
-<%= 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.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.with openid' %>
++ <%= 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 %> | +
<%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %> | -<%= 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 %> | -