Merge branch 'MDL-74348-master' of https://github.com/bmbrands/moodle

admin/tool/lp/amd/build/dialogue.min.js

@@ -6,6 +6,6 @@
  * @copyright  2015 Damyon Wiese <damyon@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define("tool_lp/dialogue",["core/yui"],(function(Y){var dialogue=function(title,content,afterShow,afterHide,wide){M.util.js_pending("tool_lp/dialogue:dialogue"),this.yuiDialogue=null;var parent=this;void 0===wide&&(wide=!1),Y.use("moodle-core-notification","timers",(function(){var width="480px";wide&&(width="800px"),parent.yuiDialogue=new M.core.dialogue({headerContent:title,bodyContent:content,draggable:!0,visible:!1,center:!0,modal:!0,width:width}),parent.yuiDialogue.before("visibleChange",(function(){M.util.js_pending("tool_lp/dialogue:before:visibleChange")})),parent.yuiDialogue.after("visibleChange",(function(e){e.newVal?void 0!==afterShow?Y.soon((function(){afterShow(parent),parent.yuiDialogue.centerDialogue(),M.util.js_complete("tool_lp/dialogue:before:visibleChange")})):M.util.js_complete("tool_lp/dialogue:before:visibleChange"):void 0!==afterHide?Y.soon((function(){afterHide(parent),M.util.js_complete("tool_lp/dialogue:before:visibleChange")})):M.util.js_complete("tool_lp/dialogue:before:visibleChange")})),parent.yuiDialogue.show(),M.util.js_complete("tool_lp/dialogue:dialogue")}))};return dialogue.prototype.close=function(){this.yuiDialogue.hide(),this.yuiDialogue.destroy()},dialogue.prototype.getContent=function(){return this.yuiDialogue.bodyNode.getDOMNode()},dialogue}));
+define("tool_lp/dialogue",["core/yui"],(function(Y){var dialogue=function(title,content,afterShow,afterHide,wide,height){M.util.js_pending("tool_lp/dialogue:dialogue"),this.yuiDialogue=null;var parent=this;void 0===wide&&(wide=!1),Y.use("moodle-core-notification","timers",(function(){var width="480px";wide&&(width="800px"),height||(height="auto"),parent.yuiDialogue=new M.core.dialogue({headerContent:title,bodyContent:content,draggable:!0,visible:!1,center:!0,modal:!0,width:width,height:height}),parent.yuiDialogue.before("visibleChange",(function(){M.util.js_pending("tool_lp/dialogue:before:visibleChange")})),parent.yuiDialogue.after("visibleChange",(function(e){e.newVal?void 0!==afterShow?Y.soon((function(){afterShow(parent),parent.yuiDialogue.centerDialogue(),M.util.js_complete("tool_lp/dialogue:before:visibleChange")})):M.util.js_complete("tool_lp/dialogue:before:visibleChange"):void 0!==afterHide?Y.soon((function(){afterHide(parent),M.util.js_complete("tool_lp/dialogue:before:visibleChange")})):M.util.js_complete("tool_lp/dialogue:before:visibleChange")})),parent.yuiDialogue.show(),M.util.js_complete("tool_lp/dialogue:dialogue")}))};return dialogue.prototype.close=function(){this.yuiDialogue.hide(),this.yuiDialogue.destroy()},dialogue.prototype.getContent=function(){return this.yuiDialogue.bodyNode.getDOMNode()},dialogue}));
 
 //# sourceMappingURL=dialogue.min.js.map

admin/tool/lp/amd/src/competencyruleconfig.js

@@ -169,7 +169,10 @@ define(['jquery',
             self._popup = new Dialogue(
                 title,
                 render[0],
-                self._afterRender.bind(self)
+                self._afterRender.bind(self),
+                null,
+                false,
+                '515px'
             );
             return;
         }).fail(Notification.exception);

admin/tool/lp/amd/src/dialogue.js

@@ -32,8 +32,9 @@ define(['core/yui'], function(Y) {
      * @param {function} afterShow Callback executed after the window is opened.
      * @param {function} afterHide Callback executed after the window is closed.
      * @param {Boolean} wide Specify we want an extra wide dialogue (the size is standard, but wider than the default).
+     * @param {String} height The height of the dialogue.
      */
-    var dialogue = function(title, content, afterShow, afterHide, wide) {
+    var dialogue = function(title, content, afterShow, afterHide, wide, height) {
         M.util.js_pending('tool_lp/dialogue:dialogue');
 
         this.yuiDialogue = null;
@@ -50,6 +51,10 @@ define(['core/yui'], function(Y) {
                 width = '800px';
             }
 
+            if (!height) {
+                height = 'auto';
+            }
+
             parent.yuiDialogue = new M.core.dialogue({
                 headerContent: title,
                 bodyContent: content,
@@ -57,7 +62,8 @@ define(['core/yui'], function(Y) {
                 visible: false,
                 center: true,
                 modal: true,
-                width: width
+                width: width,
+                height: height
             });
 
             parent.yuiDialogue.before('visibleChange', function() {

admin/tool/lp/styles.css

@@ -130,6 +130,8 @@
 
 .path-admin-tool-lp .competency-rule-points {
     margin-top: 10px;
+    max-height: 300px;
+    overflow-y: auto;
 }
 
 .path-admin-tool-lp .competency-rule-points table input {