kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Change text_field to :login from :email in line with 9d92433a7c to allow login as admin or non-ldap user when ldap is enabled

Browse source 
Also change haml style in line with that commit
This commit is contained in:
David Greaves 2013-04-01 17:51:05 +01:00 committed by Dmitriy Zaporozhets
parent b536acc92a
commit 40b949abab
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/views/devise/sessions/_new_ldap.html.haml
View file

@ -1,29 +1,29 @@
= form_tag(user_omniauth_callback_path(:ldap), :class => "login-box", :id => 'new_ldap_user' ) do = form_tag(user_omniauth_callback_path(:ldap), class: "login-box", id: 'new_ldap_user' ) do
= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
= text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login", :autofocus => "autofocus"} = text_field_tag :username, nil, {class: "text top", placeholder: "LDAP Login", autofocus: "autofocus"}
= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} = password_field_tag :password, nil, {class: "text bottom", placeholder: "Password"}
%br/ %br/
= submit_tag "LDAP Sign in", :class => "btn-primary btn" = submit_tag "LDAP Sign in", class: "btn-primary btn"
- if devise_mapping.omniauthable? - if devise_mapping.omniauthable?
- (resource_class.omniauth_providers - [:ldap]).each do |provider| - (resource_class.omniauth_providers - [:ldap]).each do |provider|
%hr/ %hr/
= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn btn-primary" = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "btn btn-primary"
%br/ %br/
%hr/ %hr/
%a#other_form_toggle{:href => "#", :onclick => "javascript:$('#new_user').toggle();"} Other Sign in %a#other_form_toggle{href: "#", onclick: "javascript:$('#new_user').toggle();"} Other Sign in
:javascript :javascript
$(function() { $(function() {
$('#new_user').toggle(); $('#new_user').toggle();
}); });
= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| = form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "login-box" }) do |f|
= f.text_field :email, :class => "text top", :placeholder => "Email" = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
= f.password_field :password, :class => "text bottom", :placeholder => "Password" = f.password_field :password, class: "text bottom", placeholder: "Password"
- if devise_mapping.rememberable? - if devise_mapping.rememberable?
.clearfix.inputs-list .clearfix.inputs-list
%label.checkbox.remember_me{:for => "user_remember_me"} %label.checkbox.remember_me{for: "user_remember_me"}
= f.check_box :remember_me = f.check_box :remember_me
%span Remember me %span Remember me
%br/ %br/
= f.submit "Sign in", :class => "btn-primary btn" = f.submit "Sign in", class: "btn-primary btn"
.pull-right .pull-right
= render :partial => "devise/shared/links" = render partial: "devise/shared/links"