X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/183a3e9d0710fc3984490a10977892e26a07e467..4143b3f77043ba4fe6a45c2432a1dfa3213f1fd2:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index adff896b5..dc330feae 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,68 +1,42 @@ -

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

+
+

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

-<% 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' %>

- - - - - - - - - - - - - +

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

+ +
<%= 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' %>)
+ + + +
<%= 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 => 3 %> + +
+ +

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

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

<%= 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", "me.yahoo.com" %> - <%= openid_button "google", "gmail.com" %> - <%= openid_button "myopenid", "myopenid.com" %> - <%= openid_button "wordpress", "wordpress.com" %> - <%= openid_button "myspace", "myspace.com" %> -
- - - + - - - - @@ -72,15 +46,36 @@
- <%= t 'user.login.openid', :logo => openid_logo %> +
+ <%= raw t 'user.login.openid', :logo => openid_logo %> <%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
+ <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> (<%= t 'user.account.openid.link text' %>)
- <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %> -
+ <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + <% end %> + +
-<% end %> - -<%= - update_page_tag do |page| - page[:openid_url].hide - page[:openid_url_hint].hide - page[:openid_submit].hide - 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] %>

+ +
+
+ +
+ +