|
|
|
@ -969,7 +969,17 @@ module ApplicationHelper
|
|
|
|
|
first_page = FirstPage.find_by_page_type('project')
|
|
|
|
|
if args.empty?
|
|
|
|
|
title = @html_title || []
|
|
|
|
|
title << @project.name if @project
|
|
|
|
|
if @project
|
|
|
|
|
title << @project.name
|
|
|
|
|
elsif @course
|
|
|
|
|
title << @course.name
|
|
|
|
|
elsif @organization
|
|
|
|
|
title << @organization.name
|
|
|
|
|
elsif @user
|
|
|
|
|
title << @user.login
|
|
|
|
|
else
|
|
|
|
|
title << User.current.login
|
|
|
|
|
end
|
|
|
|
|
if first_page.nil? || first_page.web_title.nil?
|
|
|
|
|
title << Setting.app_title unless Setting.app_title == title.last
|
|
|
|
|
else
|
|
|
|
|