X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b6d0f031375284f3404e02cab09a541377c6d14..2fb777c5be4c4b5b94b8bd5bee5f7670e3425e9d:/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 c185a11b7..19849952b 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,82 +1,96 @@ -
<%= 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.with openid' %>
- -<%= link_to_function(image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "showOpenidUrl()", :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" }) %>
+
+
+<% 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] %> + +
+
+
+
+
+
+ |
-
- | <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %> | -