From 497f06e5bc749d3f218cb01ca2135960b9ad6242 Mon Sep 17 00:00:00 2001 From: scott Date: Sat, 6 Mar 2010 03:00:02 -0500 Subject: [PATCH] added page title --- app/controllers/application_controller.rb | 6 ++- app/controllers/application_controller.rb~ | 11 ++++ app/views/layouts/application.html.erb | 2 + app/views/layouts/application.html.erb~ | 1 + public/stylesheets/style.css | 6 ++- public/stylesheets/style.css~ | 61 ++++++++++++++++++++++ 6 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 app/controllers/application_controller.rb~ create mode 100644 public/stylesheets/style.css~ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index fa075d6..63552c3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,11 +2,13 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - before_filter :authenticate + before_filter :authenticate, :set_page include Clearance::Authentication #helper :all # include all helpers, all the time protect_from_forgery # See ActionController::RequestForgeryProtection for details - # Scrub sensitive parameters from your log # filter_parameter_logging :password + def set_page + @page_title = "Collab" + end end diff --git a/app/controllers/application_controller.rb~ b/app/controllers/application_controller.rb~ new file mode 100644 index 0000000..5263147 --- /dev/null +++ b/app/controllers/application_controller.rb~ @@ -0,0 +1,11 @@ +# Filters added to this controller apply to all controllers in the application. +# Likewise, all the methods added will be available for all controllers. + +class ApplicationController < ActionController::Base + before_filter :authenticate + include Clearance::Authentication + #helper :all # include all helpers, all the time + protect_from_forgery # See ActionController::RequestForgeryProtection for details + # Scrub sensitive parameters from your log + # filter_parameter_logging :password +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b073dbb..5694a6b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,6 +5,8 @@ "http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", :defaults %> <%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %> + <%= yield :head %> + <%= @page_title %>