X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4abd9cfcf19701bf43322374c5df6dd586449e54..6f09f5d49ce117c0f34c7c82b80b19fdccb873cf:/app/views/users/login.html.erb diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb index 78ba25fa4..947aafbf9 100644 --- a/app/views/users/login.html.erb +++ b/app/views/users/login.html.erb @@ -21,48 +21,44 @@ <%= 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 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" %>
  • +
-
    -
  • <%= 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" %>
  • -
- -
- - <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %> - <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %> - (" target="_new"><%= t "users.account.openid.link text" %>) + <%= 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 %> - +