diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 137590998..21a72cf67 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,6 +13,9 @@ class ApplicationController < ActionController::Base before_filter :set_git_header if (AppConfig[:git_update] && AppConfig[:git_revision]) before_filter :set_grammatical_gender + before_filter do + puts params.inspect + end prepend_before_filter :clear_gc_stats inflection_method :grammatical_gender => :gender diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 778b4c519..ecef50181 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -8,7 +8,11 @@ module SessionsHelper end end - def should_display_registration_link? + def display_registration_link? !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations' end + + def display_password_reset_link? + devise_mapping.recoverable? && controller_name != 'passwords' + end end diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 4094c9581..ff597d942 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -33,7 +33,7 @@ = f.label :password , t('password') = f.password_field :password, :tabindex => 2 - - if devise_mapping.recoverable? && controller_name != 'passwords' + - if display_password_reset_link? = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5 %br @@ -45,7 +45,7 @@ = f.submit t('devise.sessions.new.sign_in'), :tabindex => 4 - - if should_display_registration_link? + - if display_registration_link? %br %br %br diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml index 27f76b237..1f41d4224 100644 --- a/app/views/sessions/new.mobile.haml +++ b/app/views/sessions/new.mobile.haml @@ -19,10 +19,12 @@ .centered = f.password_field :password .row + .hidden + = f.check_box('remember_me', {:tabindex => 3}, 1, 1) = f.submit t('devise.sessions.new.sign_in'), :class => 'login-submit' - - if devise_mapping.recoverable? && controller_name != 'passwords' + - if display_password_reset_link? = link_to "Forgot password?", new_password_path(resource_name) %footer - - if should_display_registration_link? + - if display_registration_link? = link_to t('.sign_up'), new_registration_path(resource_name)