Merge remote-tracking branch 'buddhamagnet/dynamic_titles'

keltia · Mar 22, 2012 · 6c21e54 · 6c21e54
2 parents 3d22915 + f8c456d
commit 6c21e54
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/app/controllers/searches_controller.rb b/app/controllers/searches_controller.rb
@@ -1,5 +1,6 @@
 class SearchesController < ApplicationController
   def show
+    @title = "search"
     @updates = []
     if params[:q]
       set_params_page

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -1,5 +1,6 @@
 class SessionsController < ApplicationController
   def new
+    @title = "sign in"
     redirect_to root_path && return if logged_in?
   end
 

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -2,4 +2,12 @@ class StaticController < ApplicationController
   def homepage
     render :layout => false
   end
+
+  def open_source
+    @title = "open source"
+  end
+
+  def contact
+    @title = "contact us"
+  end
 end
diff --git a/app/controllers/updates_controller.rb b/app/controllers/updates_controller.rb
@@ -3,6 +3,7 @@ class UpdatesController < ApplicationController
   before_filter :require_user, :only => [:timeline, :replies]
 
   def index
+    @title = "updates"
     render_index(Update)
   end
 

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -2,6 +2,7 @@ class UsersController < ApplicationController
   before_filter :find_user, :only => [:show, :edit, :update, :feed, :following, :followers]
 
   def index
+    @title = "users"
     set_params_page
     @authors = Author.search(params)