Merge jdong

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7462619a1153399c0946a85eea65dfaea48e0e06..aeb2204f38ef75015b229032463114d7975330be 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,9 +1,21 @@
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.

-require 'login_engine'

 
 class ApplicationController < ActionController::Base
 
 class ApplicationController < ActionController::Base

-  include LoginEngine
+  include AuthenticatedSystem

   helper :user
   helper :user

-  model :user
+  require_dependency "user"
+  before_filter :add_stylesheets
+   
+  def initialize
+    @stylesheets = []
+  end
+            
+  def add_stylesheets
+    file = "#{Dir.pwd}/public/stylesheets/#{controller_name}.css"
+    if File.exists? file
+      @stylesheets << controller_name
+    end
+  end
+

 end
 end