# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1363099184 0
# Node ID 2c59ee348e2beb011fb8650e2160b7d47a9584ac
# Parent  658b403da20a3afb43f26273642fc3e285570384
Logger, reinstate this box as default

diff -r 658b403da20a -r 2c59ee348e2b app/controllers/my_controller.rb
--- 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,
diff -r 658b403da20a -r 2c59ee348e2b app/helpers/activities_helper.rb
--- 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
diff -r 658b403da20a -r 2c59ee348e2b public/themes/soundsoftware/stylesheets/application.css
--- 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; }