X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7876b4477bb9c27e12b941b460e6505f1ba8baa..76559d3de23b3af28b6d2014d12ed48d0cfc74cd:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index e5f87e180..c2deada5c 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,66 +1,78 @@ -<%= javascript_include_tag 'openID.js' %> -

<%= 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' do %> + <%= 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',{: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.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>

-
- - -
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
-
-
-<% end %> + + + + + + + + + + + +
<%= 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' %>

+ + + + + + + + + + + + +
+ <%= 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 %> + +
+ +