X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..6f09f5d49ce117c0f34c7c82b80b19fdccb873cf:/app/views/users/login.html.erb diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb index 04a04158c..947aafbf9 100644 --- a/app/views/users/login.html.erb +++ b/app/views/users/login.html.erb @@ -3,89 +3,62 @@ <% end %> <% content_for :heading do %> -

<%= t '.heading' %>

+

<%= t ".heading" %>

<% end %>
- <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> - <%= hidden_field_tag('referer', h(params[:referer])) %> +

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

-

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

+ <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %> + <%= hidden_field_tag("referer", h(params[:referer])) %> -
- -
-
- - <%= text_field_tag "username", params[:username], :tabindex => 1 %> -
-
- - <%= password_field_tag "password", "", :tabindex => 2 %> -
- - <%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %> - -
- -
- <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> - - <%= submit_tag t('.login_button'), :tabindex => 4 %> -
- -
+ <%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %> + <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "users", :action => "lost_password") %> + <%= f.form_group do %> + <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %> + <% end %> + <%= f.primary t(".login_button"), :tabindex => 4 %> <% end %> - <%= form_tag(auth_path(:provider => "openid"), { :id => "openid_login_form" }) do %> -
- -
- -

<%= t '.with external' %>

- -
    -
  • <%= 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 -%> - <% 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" %>
  • -
- -
- - <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %> - <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> - (<%= t 'users.account.openid.link text' %>) +
+ +
+
+ + +
    +
  • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %>
  • + <% if Settings.key?(:google_auth_id) -%> +
  • <%= auth_button "google", "google" %>
  • + <% end -%> + <% if Settings.key?(:facebook_auth_id) -%> +
  • <%= auth_button "facebook", "facebook" %>
  • + <% end -%> + <% if Settings.key?(:windowslive_auth_id) -%> +
  • <%= auth_button "windowslive", "windowslive" %>
  • + <% end -%> + <% if Settings.key?(:github_auth_id) -%> +
  • <%= auth_button "github", "github" %>
  • + <% end -%> + <% if Settings.key?(: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" %>
  • +
+ + <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> +
+ + <%= hidden_field_tag("referer", params[:referer]) %> + <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url form-control") %> + (" target="_new"><%= t "users.account.openid.link text" %>)
- <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %> - -
- + <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %> + <% end %>
- - <% end %> - +