Mercurial > hg > soundsoftware-site
changeset 1222:2c59ee348e2b cannam
Logger, reinstate this box as default
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Tue, 12 Mar 2013 14:39:44 +0000 |
| parents | 658b403da20a |
| children | 324461c477a7 |
| files | app/controllers/my_controller.rb app/helpers/activities_helper.rb public/themes/soundsoftware/stylesheets/application.css |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/my_controller.rb Tue Mar 12 13:24:19 2013 +0000 +++ b/app/controllers/my_controller.rb Tue Mar 12 14:39:44 2013 +0000 @@ -38,7 +38,7 @@ }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze DEFAULT_LAYOUT = { 'left' => ['myprojects', 'activitymyprojects'], - 'right' => ['tipoftheday', 'issueswatched'] + 'right' => ['tipoftheday', 'colleagues', 'issueswatched'] }.freeze verify :xhr => true,
--- a/app/helpers/activities_helper.rb Tue Mar 12 13:24:19 2013 +0000 +++ b/app/helpers/activities_helper.rb Tue Mar 12 14:39:44 2013 +0000 @@ -61,6 +61,8 @@ s = "" + start = Time.now + for c in colleagues u = User.find_by_id(c) active_projects = projects_by_activity(u, 3) @@ -82,6 +84,9 @@ s << "</div>" end end + + finish = Time.now + logger.info "render_active_colleagues: took #{finish-start}" if s != "" s
--- a/public/themes/soundsoftware/stylesheets/application.css Tue Mar 12 13:24:19 2013 +0000 +++ b/public/themes/soundsoftware/stylesheets/application.css Tue Mar 12 14:39:44 2013 +0000 @@ -80,7 +80,6 @@ .box .more { margin-left: 40px; } .box .institution { font-size: 0.95em; } -.box .active { margin-left: 2em; } #content .tabs { margin-bottom: 0; }