diff options
author | jdamick <jeffreydamick@gmail.com> | 2012-06-15 17:07:53 -0400 |
---|---|---|
committer | jdamick <jeffreydamick@gmail.com> | 2012-06-15 17:07:53 -0400 |
commit | 6ace52bb2b0d999d1f185bf74b2954b9ee41dbe4 (patch) | |
tree | 5782e6605d7bb54859d7b45028141a11a0ea728a | |
parent | b9ab93e1086b3b6e263bbb056241769e54fc4396 (diff) | |
download | gitlab-ce-6ace52bb2b0d999d1f185bf74b2954b9ee41dbe4.tar.gz |
customizing the user login screen for primarily ldap authentication
-rw-r--r-- | app/views/devise/sessions/new.html.erb | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a2956eb31d9..89b2569df60 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,5 +1,33 @@ +<% if ldap_enable? -%> + <%= form_for(resource, :as => resource_name, :url => user_omniauth_callback_path(:ldap), :html => { :class => "login-box", :id => 'new_ldap_user' }) do |f| %> + <%= 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"} %> + <%= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} %> + + <% if devise_mapping.rememberable? -%> + <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div> + <% end -%> + <br/> + <%= f.submit "LDAP Sign in", :class => "primary btn" %> + <hr/> + <a href="#" id="admin_form_toggle" onclick="javascript:$('#new_user').toggle();">Admin Sign in</a> + <!-- inline right just to illustrate --> + <script type="text/javascript"> + $(function() { + $('#new_user').toggle(); + }); + </script> + <% end %> +<% end %> + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %> - <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> + <% unless ldap_enable? %> + <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> + <% else %> + <!-- <a href="#" id="ldap_form_toggle" onclick="javascript:$('#new_ldap_user').toggle();">LDAP Sign in</a> --> + <% end %> + <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> @@ -16,7 +44,5 @@ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> <% end -%> <% end -%> - <% if ldap_enable? -%> - <p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p> - <% end -%> + <% end %> |