From: Dan Poltawski <dan@moodle.com>
Date: Thu, 17 May 2012 13:04:30 +0000 (+0800)
Subject: Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
X-Git-Tag: v2.3.0-beta~390
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=03ba9dac9489f6c3e5eec342b0cedf62218c5923;hp=1ed2dc6f96294c1ac8c553a53f3e857b6c4e1f4b

Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
---

diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
index 0c216484bb6..2a7813fd5e3 100644
--- a/course/yui/toolboxes/toolboxes.js
+++ b/course/yui/toolboxes/toolboxes.js
@@ -3,7 +3,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
     // The CSS selectors we use
     var CSS = {
         ACTIVITYLI : 'li.activity',
-        COMMANDSPAN : 'li.activity span.commands',
+        COMMANDSPAN : 'span.commands',
         SPINNERCOMMANDSPAN : 'span.commands',
         CONTENTAFTERLINK : 'div.contentafterlink',
         DELETE : 'a.editing_delete',
@@ -252,7 +252,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
          */
         setup_for_resource : function(baseselector) {
             if (!baseselector) {
-                var baseselector = CSS.PAGECONTENT;
+                var baseselector = CSS.PAGECONTENT + ' ' + CSS.ACTIVITYLI;;
             }
 
             Y.all(baseselector).each(this._setup_for_resource, this);