Skip to content

Commit

Permalink
Merge remote-tracking branch 'buddhamagnet/dynamic_titles'
Browse files Browse the repository at this point in the history
  • Loading branch information
carols10cents committed Mar 22, 2012
2 parents 3d22915 + f8c456d commit 6c21e54
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/searches_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class SearchesController < ApplicationController
def show
@title = "search"
@updates = []
if params[:q]
set_params_page
Expand Down
1 change: 1 addition & 0 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class SessionsController < ApplicationController
def new
@title = "sign in"
redirect_to root_path && return if logged_in?
end

Expand Down
8 changes: 8 additions & 0 deletions app/controllers/static_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions app/controllers/updates_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class UpdatesController < ApplicationController
before_filter :require_user, :only => [:timeline, :replies]

def index
@title = "updates"
render_index(Update)
end

Expand Down
1 change: 1 addition & 0 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 6c21e54

Please sign in to comment.