diff options
Diffstat (limited to 'app/views/devise/sessions/new.html.erb')
| -rw-r--r-- | app/views/devise/sessions/new.html.erb | 53 |
1 files changed, 16 insertions, 37 deletions
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 89b2569df60..a03838669cf 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,48 +1,27 @@ -<% 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| %> +<% unless ldap_enable? -%> + + <%= 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" %> - <%= text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"} %> - <%= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} %> + <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> + <%= f.password_field :password, :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| %> - <% 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" %> - - <% 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 "Sign in", :class => "primary btn" %> - <div class="right"> <%= render :partial => "devise/shared/links" %></div> + <%= f.submit "Sign in", :class => "primary btn" %> + <div class="right"> <%= render :partial => "devise/shared/links" %></div> - <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <hr/> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> + <%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <hr/> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> + <% end -%> <% end -%> - <% end -%> + <% end %> + +<% else %> + <%= render :partial => 'devise/sessions/new_ldap' %> <% end %> |