X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9fbd888e04e545bf61789973b1ed5b457e2b1be9..b897832349ad0878e950ed177b7a050efb9a4a7c:/app/views/user/login.html.erb?ds=inline diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 89a2ec458..26bb80895 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,66 +1,88 @@ -<%= javascript_include_tag 'openID.js' %> - -

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

+<% content_for :head do %> + <%= javascript_include_tag "login" %> +<% end %> -

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

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

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

- - - - - - - - - -
- <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %> - <%= t 'user.login.openid' %> - <%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url"}) %>
- - (<%= t 'user.account.openid.link text' %>) - -
- - <%= image_tag "openid_logo.png", :alt => t('user.login.openid_providers.openid.title') %> - - - <%= image_tag "yahoo.png", :alt => t('user.login.openid_providers.yahoo.alt') %> - - - <%= image_tag "google.png", :alt => t('user.login.openid_providers.google.alt') %> - - - <%= image_tag "myopenid.png", :alt => t('user.login.openid_providers.myopenid.alt') %> - - - <%= image_tag "wordpress.png", :alt => t('user.login.openid_providers.wordpress.alt') %> - - - <%= image_tag "myspace.png", :alt => t('user.login.openid_providers.myspace.alt') %> - +

<%= 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") %>
    • + <% if defined?(GOOGLE_AUTH_ID) -%> +
  • <%= auth_button "google", "google" %>
    • + <% end -%> + <% if defined?(FACEBOOK_AUTH_ID) -%> +
  • <%= auth_button "facebook", "facebook" %>
    • + <% end -%> + <% if defined?(WINDOWSLIVE_AUTH_ID) -%> +
  • <%= auth_button "windowslive", "windowslive" %>
    • + <% end -%> + <% if defined?(GITHUB_AUTH_ID) -%> +
  • <%= auth_button "github", "github" %>
    • + <% end -%> + <% if defined?(WIKIPEDIA_AUTH_ID) -%> +
  • <%= auth_button "wikipedia", "wikipedia" %>
    • + <% end -%> +
  • <%= 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", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
+
+ <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> +
+ + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + +
+
-<% end %> + + <% end %> + +