X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b8b9104cc29116dae4422248fdf0668561134d5..e434cb154c5ccecd7fc0ce672e4de79bd9e7e06f:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 66a2fab99..0f193e896 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,25 +1,89 @@ -
-
-

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

- -

<%= t 'user.login.already have' %>

- - <% form_tag :action => 'login' do %> - <%= hidden_field_tag('referer', h(params[:referer])) %> - - - - -
<%= 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' %>)
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
- <%= submit_tag t('user.login.login_button'), :tabindex => 3 %> - <% end %> -
-
-
-

<%= t 'user.login.new to osm' %>

-

<%= t 'user.login.to make changes' %>

-

<%= t 'user.login.create account minute' %>

-

<%= button_to t('user.login.register now'), :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])) %> + +

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

+ +
+ +
+
+ + <%= text_field_tag "username", params[:username], :tabindex => 1 %> +
+
+ + <%= password_field_tag "password", "", :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 external' %>

+ +
    +
  • <%= link_to image_tag("openid.png", :alt => t("user.login.auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.auth_providers.openid.title") %>
  • +
  • <%= auth_button "google", "openid", :openid_url => "https://www.google.com/accounts/o8/id" %>
  • +
  • <%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %>
  • +
  • <%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %>
  • +
  • <%= auth_button "aol", "openid", :openid_url => "aol.com" %>
  • +
+ +
+ + <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> + (<%= t 'user.account.openid.link text' %>) +
+ +
+ <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> + +
+ + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + +
+ +
+ + <% end %> +
+ +