diff --git a/app/views/devise/sessions/_new_ldap.html.erb b/app/views/devise/sessions/_new_ldap.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..35dfaf714092c4295abff24d8c007e90a15eb0a2 --- /dev/null +++ b/app/views/devise/sessions/_new_ldap.html.erb @@ -0,0 +1,39 @@ +<%= 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" %> + + <%= text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"} %> + <%= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} %> + +
+ <%= submit_tag "LDAP Sign in", :class => "primary btn" %> + + <%- if devise_mapping.omniauthable? %> + <%- (resource_class.omniauth_providers - [:ldap]).each do |provider| %> +
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %>
+ <% end -%> + <% end -%> + +
+ Other Sign in + + +<% end %> + + +<%= 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.password_field :password, :class => "text bottom", :placeholder => "Password" %> + + <% if devise_mapping.rememberable? -%> +
+ <% end -%> +
+ <%= f.submit "Sign in", :class => "primary btn" %> +
<%= render :partial => "devise/shared/links" %>
+ +<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a2956eb31d97e76dff885b4967d1142b89c11db1..a03838669cf9c8c859f9d92d10247910fb0c84c0 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,22 +1,27 @@ -<%= 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" %> - <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> - <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> +<% unless ldap_enable? -%> - <% if devise_mapping.rememberable? -%> -
- <% end -%> -
- <%= f.submit "Sign in", :class => "primary btn" %> -
<%= render :partial => "devise/shared/links" %>
+ <%= 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" %> - <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> -
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %>
+ <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> + <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> + + <% if devise_mapping.rememberable? -%> +
+ <% end -%> +
+ <%= f.submit "Sign in", :class => "primary btn" %> +
<%= render :partial => "devise/shared/links" %>
+ + <%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> +
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %>
+ <% end -%> <% end -%> - <% end -%> - <% if ldap_enable? -%> -

<%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%>

- <% end -%> + + <% end %> + +<% else %> + <%= render :partial => 'devise/sessions/new_ldap' %> <% end %>