Merge branch 'MDL-42756_28' of git://github.com/aolley/moodle into MO…

…ODLE_28_STABLE
moodle · Nov 17, 2014 · 3b8a871 · 3b8a871
2 parents ccfd014 + b19e9ae
commit 3b8a871
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js b/lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js
@@ -1972,6 +1972,9 @@ DOCKEDITEM.prototype = {
         Y.log('Showing '+this._getLogDescription(), 'debug', LOGNS);
         panel.setHeader(this.get('titlestring'), this.get('commands'));
         panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
+        if (M.core.actionmenu !== undefined) {
+            M.core.actionmenu.newDOMNode(panel.get('node'));
+        }
         panel.show();
         panel.correctWidth();
 

diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock-min.js b/lib/yui/build/moodle-core-dock/moodle-core-dock-min.js
diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock.js b/lib/yui/build/moodle-core-dock/moodle-core-dock.js
@@ -1955,6 +1955,9 @@ DOCKEDITEM.prototype = {
         this.fire('dockeditem:showstart');
         panel.setHeader(this.get('titlestring'), this.get('commands'));
         panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
+        if (M.core.actionmenu !== undefined) {
+            M.core.actionmenu.newDOMNode(panel.get('node'));
+        }
         panel.show();
         panel.correctWidth();
 

diff --git a/lib/yui/src/dock/js/dockeditem.js b/lib/yui/src/dock/js/dockeditem.js
@@ -133,6 +133,9 @@ DOCKEDITEM.prototype = {
         Y.log('Showing '+this._getLogDescription(), 'debug', LOGNS);
         panel.setHeader(this.get('titlestring'), this.get('commands'));
         panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
+        if (M.core.actionmenu !== undefined) {
+            M.core.actionmenu.newDOMNode(panel.get('node'));
+        }
         panel.show();
         panel.correctWidth();
 

diff --git a/theme/bootstrapbase/less/moodle/dock.less b/theme/bootstrapbase/less/moodle/dock.less
@@ -126,6 +126,9 @@ body.has_dock {
             .hidepanemicon img {
                 cursor: pointer;
             }
+            img.actionmenu {
+                width: auto;
+            }
         }
     }
 }

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css