Mercurial > hg > soundsoftware-site
comparison app/controllers/my_controller.rb @ 486:4c0d58c5d1e0 cannam
Merge
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Mon, 11 Jul 2011 16:42:20 +0100 |
parents | ef125e1f3a10 |
children | 5e80956cc792 |
comparison
equal
deleted
inserted
replaced
475:32dd9e02950a | 486:4c0d58c5d1e0 |
---|---|
32 'documents' => :label_document_plural, | 32 'documents' => :label_document_plural, |
33 'timelog' => :label_spent_time | 33 'timelog' => :label_spent_time |
34 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze | 34 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze |
35 | 35 |
36 DEFAULT_LAYOUT = { 'left' => ['tipoftheday', 'activitymyprojects'], | 36 DEFAULT_LAYOUT = { 'left' => ['tipoftheday', 'activitymyprojects'], |
37 'right' => ['issueswatched','calendar'] | 37 'right' => ['issueswatched'] |
38 }.freeze | 38 }.freeze |
39 | 39 |
40 verify :xhr => true, | 40 verify :xhr => true, |
41 :only => [:add_block, :remove_block, :order_blocks] | 41 :only => [:add_block, :remove_block, :order_blocks] |
42 | 42 |