Mercurial > hg > soundsoftware-site
diff app/controllers/my_controller.rb @ 443:350acce374a2 cannam
Merge from branch "cannam-pre-20110113-merge"
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:55:38 +0100 |
parents | 73ff0e6a11b1 ce85aa993384 |
children | ef125e1f3a10 |
line wrap: on
line diff
--- a/app/controllers/my_controller.rb Mon Jun 06 14:41:04 2011 +0100 +++ b/app/controllers/my_controller.rb Mon Jun 06 14:55:38 2011 +0100 @@ -25,14 +25,16 @@ BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues, 'issuesreportedbyme' => :label_reported_issues, 'issueswatched' => :label_watched_issues, + 'activitymyprojects' => :label_activity_my_recent, 'news' => :label_news_latest, + 'tipoftheday' => :label_tipoftheday, 'calendar' => :label_calendar, 'documents' => :label_document_plural, 'timelog' => :label_spent_time }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze - DEFAULT_LAYOUT = { 'left' => ['issuesassignedtome'], - 'right' => ['issuesreportedbyme'] + DEFAULT_LAYOUT = { 'left' => ['tipoftheday', 'activitymyprojects'], + 'right' => ['issueswatched','calendar'] }.freeze verify :xhr => true,