X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6:/app/views/user/login.html.erb diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index e6efdc5ce..21705e358 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -3,49 +3,49 @@ <% end %> <% content_for :heading do %> -

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

+

<%= t '.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 '.no account' %> <%= link_to t('.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' %> + <%= link_to t('.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 %> + <%= submit_tag t('.login_button'), :tabindex => 4 %>
-

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

+

<%= t '.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") %>
  • +
  • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %>
  • <% if defined?(GOOGLE_AUTH_ID) -%>
  • <%= auth_button "google", "google" %>
  • <% end -%> @@ -55,23 +55,29 @@ <% 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('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>