X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ded8b55c87f32579b9f42ecb8a58567f4dfe30d..0df788d74232330eea5c2d4854ba0d10796053eb:/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 f03292fe9..26bb80895 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,82 +1,88 @@ +<% content_for :head do %> + <%= javascript_include_tag "login" %> +<% end %> -
<% 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] %>

+

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

+
- - <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %> -
-
- - <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %> -

+

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

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

- - - -
-
- - <%= url_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> - (<%= t 'user.account.openid.link text' %>) -
-
- - <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %> + +
+ +

<%= 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_openid", "yes", false, :tabindex => 5 %> + +
+ + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> +
+
- <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + <% end %>
- -