Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle

backup/util/ui/base_moodleform.class.php

@@ -353,7 +353,7 @@ abstract class base_moodleform extends moodleform {
         // Get list of module types on course.
         $modinfo = get_fast_modinfo($COURSE);
         $modnames = $modinfo->get_used_module_names(true);
-        $PAGE->requires->yui_module('moodle-backup-backupselectall', 'M.core_backup.select_all_init',
+        $PAGE->requires->yui_module('moodle-backup-backupselectall', 'M.core_backup.backupselectall',
                 array($modnames));
         $PAGE->requires->strings_for_js(array('select', 'all', 'none'), 'moodle');
         $PAGE->requires->strings_for_js(array('showtypes', 'hidetypes'), 'backup');

backup/util/ui/yui/build/moodle-backup-backupselectall/moodle-backup-backupselectall-debug.js

@@ -0,0 +1,169 @@
+YUI.add('moodle-backup-backupselectall', function (Y, NAME) {
+
+/**
+ * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @module moodle-backup-backupselectall
+ */
+
+// Namespace for the backup
+M.core_backup = M.core_backup || {};
+
+/**
+ * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @class M.core_backup.backupselectall
+ */
+M.core_backup.backupselectall = function(modnames) {
+    var formid = null;
+
+    var helper = function(e, check, type, mod) {
+        e.preventDefault();
+        var prefix = '';
+        if (typeof mod !== 'undefined') {
+            prefix = 'setting_activity_' + mod + '_';
+        }
+
+        var len = type.length;
+        Y.all('input[type="checkbox"]').each(function(checkbox) {
+            var name = checkbox.get('name');
+            // If a prefix has been set, ignore checkboxes which don't have that prefix.
+            if (prefix && name.substring(0, prefix.length) !== prefix) {
+                return;
+            }
+            if (name.substring(name.length - len) === type) {
+                checkbox.set('checked', check);
+            }
+        });
+
+        // At this point, we really need to persuade the form we are part of to
+        // update all of its disabledIf rules. However, as far as I can see,
+        // given the way that lib/form/form.js is written, that is impossible.
+        if (formid && M.form) {
+            M.form.updateFormState(formid);
+        }
+    };
+
+    var html_generator = function(classname, idtype, heading, extra) {
+        if (typeof extra === 'undefined') {
+            extra = '';
+        }
+        return '<div class="' + classname + '">' +
+                    '<div class="fitem fitem_fcheckbox backup_selector">' +
+                        '<div class="fitemtitle">' + heading + '</div>' +
+                        '<div class="felement">' +
+                            '<a id="backup-all-' + idtype + '" href="#">' + M.util.get_string('all', 'moodle') + '</a> / ' +
+                            '<a id="backup-none-' + idtype + '" href="#">' + M.util.get_string('none', 'moodle') + '</a>' +
+                            extra +
+                        '</div>' +
+                    '</div>' +
+                '</div>';
+    };
+
+    var firstsection = Y.one('fieldset#id_coursesettings .fcontainer.clearfix .grouped_settings.section_level');
+    if (!firstsection) {
+        // This is not a relevant page.
+        return;
+    }
+    if (!firstsection.one('.felement.fcheckbox')) {
+        // No checkboxes.
+        return;
+    }
+
+    formid = firstsection.ancestor('form').getAttribute('id');
+
+    var withuserdata = false;
+    Y.all('input[type="checkbox"]').each(function(checkbox) {
+        var name = checkbox.get('name');
+        if (name.substring(name.length - 9) === '_userdata') {
+            withuserdata = '_userdata';
+        } else if (name.substring(name.length - 9) === '_userinfo') {
+            withuserdata = '_userinfo';
+        }
+    });
+
+    // Add global select all/none options.
+    var html = html_generator('include_setting section_level', 'included', M.util.get_string('select', 'moodle'),
+            ' (<a id="backup-bytype" href="#">' + M.util.get_string('showtypes', 'backup') + '</a>)');
+    if (withuserdata) {
+        html += html_generator('normal_setting', 'userdata', M.util.get_string('select', 'moodle'));
+    }
+    var links = Y.Node.create('<div class="grouped_settings section_level">' + html + '</div>');
+    firstsection.insert(links, 'before');
+
+    // Add select all/none for each module type.
+    var initlinks = function(links, mod) {
+        Y.one('#backup-all-mod_' + mod).on('click', function(e) { helper(e, true, '_included', mod); });
+        Y.one('#backup-none-mod_' + mod).on('click', function(e) { helper(e, false, '_included', mod); });
+        if (withuserdata) {
+            Y.one('#backup-all-userdata-mod_' + mod).on('click', function(e) { helper(e, true, withuserdata, mod); });
+            Y.one('#backup-none-userdata-mod_' + mod).on('click', function(e) { helper(e, false, withuserdata, mod); });
+        }
+    };
+
+    // For each module type on the course, add hidden select all/none options.
+    var modlist = Y.Node.create('<div id="mod_select_links">');
+    modlist.hide();
+    modlist.currentlyshown = false;
+    links.appendChild(modlist);
+    for (var mod in modnames) {
+        // Only include actual values from the list.
+        if (!modnames.hasOwnProperty(mod)) {
+            continue;
+        }
+        html = html_generator('include_setting section_level', 'mod_' + mod, modnames[mod]);
+        if (withuserdata) {
+            html += html_generator('normal_setting', 'userdata-mod_' + mod, modnames[mod]);
+        }
+        var modlinks = Y.Node.create(
+            '<div class="grouped_settings section_level">' + html + '</div>');
+        modlist.appendChild(modlinks);
+        initlinks(modlinks, mod);
+    }
+
+    // Toggles the display of the hidden module select all/none links.
+    var toggletypes = function() {
+        // Change text of type toggle link.
+        var link = Y.one('#backup-bytype');
+        if (modlist.currentlyshown) {
+            link.setHTML(M.util.get_string('showtypes', 'backup'));
+        } else {
+            link.setHTML(M.util.get_string('hidetypes', 'backup'));
+        }
+
+        // The link has now been toggled (from show to hide, or vice-versa).
+        modlist.currentlyshown = !modlist.currentlyshown;
+
+        // Either hide or show the links.
+        var animcfg = { node: modlist, duration: 0.2 },
+            anim;
+        if (modlist.currentlyshown) {
+            // Animate reveal of the module links.
+            modlist.show();
+            animcfg.to = { maxHeight: modlist.get('clientHeight') + 'px' };
+            modlist.setStyle('maxHeight', '0px');
+            anim = new Y.Anim(animcfg);
+            anim.on('end', function() { modlist.setStyle('maxHeight', 'none'); });
+            anim.run();
+        } else {
+            // Animate hide of the module links.
+            animcfg.to = { maxHeight: '0px' };
+            modlist.setStyle('maxHeight', modlist.get('clientHeight') + 'px');
+            anim = new Y.Anim(animcfg);
+            anim.on('end', function() { modlist.hide(); modlist.setStyle('maxHeight', 'none'); });
+            anim.run();
+        }
+
+    };
+    Y.one('#backup-bytype').on('click', function() { toggletypes(); });
+
+    Y.one('#backup-all-included').on('click',  function(e) { helper(e, true,  '_included'); });
+    Y.one('#backup-none-included').on('click', function(e) { helper(e, false, '_included'); });
+    if (withuserdata) {
+        Y.one('#backup-all-userdata').on('click',  function(e) { helper(e, true,  withuserdata); });
+        Y.one('#backup-none-userdata').on('click', function(e) { helper(e, false, withuserdata); });
+    }
+};
+
+
+}, '@VERSION@');

backup/util/ui/yui/build/moodle-backup-backupselectall/moodle-backup-backupselectall-min.js

@@ -0,0 +1 @@
+YUI.add("moodle-backup-backupselectall",function(e,t){M.core_backup=M.core_backup||{},M.core_backup.backupselectall=function(t){var n=null,r=function(t,r,i,s){t.preventDefault();var o="";typeof s!="undefined"&&(o="setting_activity_"+s+"_");var u=i.length;e.all('input[type="checkbox"]').each(function(e){var t=e.get("name");if(o&&t.substring(0,o.length)!==o)return;t.substring(t.length-u)===i&&e.set("checked",r)}),n&&M.form&&M.form.updateFormState(n)},i=function(e,t,n,r){return typeof r=="undefined"&&(r=""),'<div class="'+e+'">'+'<div class="fitem fitem_fcheckbox backup_selector">'+'<div class="fitemtitle">'+n+"</div>"+'<div class="felement">'+'<a id="backup-all-'+t+'" href="#">'+M.util.get_string("all","moodle")+"</a> / "+'<a id="backup-none-'+t+'" href="#">'+M.util.get_string("none","moodle")+"</a>"+r+"</div>"+"</div>"+"</div>"},s=e.one("fieldset#id_coursesettings .fcontainer.clearfix .grouped_settings.section_level");if(!s)return;if(!s.one(".felement.fcheckbox"))return;n=s.ancestor("form").getAttribute("id");var o=!1;e.all('input[type="checkbox"]').each(function(e){var t=e.get("name");t.substring(t.length-9)==="_userdata"?o="_userdata":t.substring(t.length-9)==="_userinfo"&&(o="_userinfo")});var u=i("include_setting section_level","included",M.util.get_string("select","moodle"),' (<a id="backup-bytype" href="#">'+M.util.get_string("showtypes","backup")+"</a>)");o&&(u+=i("normal_setting","userdata",M.util.get_string("select","moodle")));var a=e.Node.create('<div class="grouped_settings section_level">'+u+"</div>");s.insert(a,"before");var f=function(t,n){e.one("#backup-all-mod_"+n).on("click",function(e){r(e,!0,"_included",n)}),e.one("#backup-none-mod_"+n).on("click",function(e){r(e,!1,"_included",n)}),o&&(e.one("#backup-all-userdata-mod_"+n).on("click",function(e){r(e,!0,o,n)}),e.one("#backup-none-userdata-mod_"+n).on("click",function(e){r(e,!1,o,n)}))},l=e.Node.create('<div id="mod_select_links">');l.hide(),l.currentlyshown=!1,a.appendChild(l);for(var c in t){if(!t.hasOwnProperty(c))continue;u=i("include_setting section_level","mod_"+c,t[c]),o&&(u+=i("normal_setting","userdata-mod_"+c,t[c]));var h=e.Node.create('<div class="grouped_settings section_level">'+u+"</div>");l.appendChild(h),f(h,c)}var p=function(){var t=e.one("#backup-bytype");l.currentlyshown?t.setHTML(M.util.get_string("showtypes","backup")):t.setHTML(M.util.get_string("hidetypes","backup")),l.currentlyshown=!l.currentlyshown;var n={node:l,duration:.2},r;l.currentlyshown?(l.show(),n.to={maxHeight:l.get("clientHeight")+"px"},l.setStyle("maxHeight","0px"),r=new e.Anim(n),r.on("end",function(){l.setStyle("maxHeight","none")}),r.run()):(n.to={maxHeight:"0px"},l.setStyle("maxHeight",l.get("clientHeight")+"px"),r=new e.Anim(n),r.on("end",function(){l.hide(),l.setStyle("maxHeight","none")}),r.run())};e.one("#backup-bytype").on("click",function(){p()}),e.one("#backup-all-included").on("click",function(e){r(e,!0,"_included")}),e.one("#backup-none-included").on("click",function(e){r(e,!1,"_included")}),o&&(e.one("#backup-all-userdata").on("click",function(e){r(e,!0,o)}),e.one("#backup-none-userdata").on("click",function(e){r(e,!1,o)}))}},"@VERSION@");

backup/util/ui/yui/build/moodle-backup-backupselectall/moodle-backup-backupselectall.js

@@ -0,0 +1,169 @@
+YUI.add('moodle-backup-backupselectall', function (Y, NAME) {
+
+/**
+ * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @module moodle-backup-backupselectall
+ */
+
+// Namespace for the backup
+M.core_backup = M.core_backup || {};
+
+/**
+ * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @class M.core_backup.backupselectall
+ */
+M.core_backup.backupselectall = function(modnames) {
+    var formid = null;
+
+    var helper = function(e, check, type, mod) {
+        e.preventDefault();
+        var prefix = '';
+        if (typeof mod !== 'undefined') {
+            prefix = 'setting_activity_' + mod + '_';
+        }
+
+        var len = type.length;
+        Y.all('input[type="checkbox"]').each(function(checkbox) {
+            var name = checkbox.get('name');
+            // If a prefix has been set, ignore checkboxes which don't have that prefix.
+            if (prefix && name.substring(0, prefix.length) !== prefix) {
+                return;
+            }
+            if (name.substring(name.length - len) === type) {
+                checkbox.set('checked', check);
+            }
+        });
+
+        // At this point, we really need to persuade the form we are part of to
+        // update all of its disabledIf rules. However, as far as I can see,
+        // given the way that lib/form/form.js is written, that is impossible.
+        if (formid && M.form) {
+            M.form.updateFormState(formid);
+        }
+    };
+
+    var html_generator = function(classname, idtype, heading, extra) {
+        if (typeof extra === 'undefined') {
+            extra = '';
+        }
+        return '<div class="' + classname + '">' +
+                    '<div class="fitem fitem_fcheckbox backup_selector">' +
+                        '<div class="fitemtitle">' + heading + '</div>' +
+                        '<div class="felement">' +
+                            '<a id="backup-all-' + idtype + '" href="#">' + M.util.get_string('all', 'moodle') + '</a> / ' +
+                            '<a id="backup-none-' + idtype + '" href="#">' + M.util.get_string('none', 'moodle') + '</a>' +
+                            extra +
+                        '</div>' +
+                    '</div>' +
+                '</div>';
+    };
+
+    var firstsection = Y.one('fieldset#id_coursesettings .fcontainer.clearfix .grouped_settings.section_level');
+    if (!firstsection) {
+        // This is not a relevant page.
+        return;
+    }
+    if (!firstsection.one('.felement.fcheckbox')) {
+        // No checkboxes.
+        return;
+    }
+
+    formid = firstsection.ancestor('form').getAttribute('id');
+
+    var withuserdata = false;
+    Y.all('input[type="checkbox"]').each(function(checkbox) {
+        var name = checkbox.get('name');
+        if (name.substring(name.length - 9) === '_userdata') {
+            withuserdata = '_userdata';
+        } else if (name.substring(name.length - 9) === '_userinfo') {
+            withuserdata = '_userinfo';
+        }
+    });
+
+    // Add global select all/none options.
+    var html = html_generator('include_setting section_level', 'included', M.util.get_string('select', 'moodle'),
+            ' (<a id="backup-bytype" href="#">' + M.util.get_string('showtypes', 'backup') + '</a>)');
+    if (withuserdata) {
+        html += html_generator('normal_setting', 'userdata', M.util.get_string('select', 'moodle'));
+    }
+    var links = Y.Node.create('<div class="grouped_settings section_level">' + html + '</div>');
+    firstsection.insert(links, 'before');
+
+    // Add select all/none for each module type.
+    var initlinks = function(links, mod) {
+        Y.one('#backup-all-mod_' + mod).on('click', function(e) { helper(e, true, '_included', mod); });
+        Y.one('#backup-none-mod_' + mod).on('click', function(e) { helper(e, false, '_included', mod); });
+        if (withuserdata) {
+            Y.one('#backup-all-userdata-mod_' + mod).on('click', function(e) { helper(e, true, withuserdata, mod); });
+            Y.one('#backup-none-userdata-mod_' + mod).on('click', function(e) { helper(e, false, withuserdata, mod); });
+        }
+    };
+
+    // For each module type on the course, add hidden select all/none options.
+    var modlist = Y.Node.create('<div id="mod_select_links">');
+    modlist.hide();
+    modlist.currentlyshown = false;
+    links.appendChild(modlist);
+    for (var mod in modnames) {
+        // Only include actual values from the list.
+        if (!modnames.hasOwnProperty(mod)) {
+            continue;
+        }
+        html = html_generator('include_setting section_level', 'mod_' + mod, modnames[mod]);
+        if (withuserdata) {
+            html += html_generator('normal_setting', 'userdata-mod_' + mod, modnames[mod]);
+        }
+        var modlinks = Y.Node.create(
+            '<div class="grouped_settings section_level">' + html + '</div>');
+        modlist.appendChild(modlinks);
+        initlinks(modlinks, mod);
+    }
+
+    // Toggles the display of the hidden module select all/none links.
+    var toggletypes = function() {
+        // Change text of type toggle link.
+        var link = Y.one('#backup-bytype');
+        if (modlist.currentlyshown) {
+            link.setHTML(M.util.get_string('showtypes', 'backup'));
+        } else {
+            link.setHTML(M.util.get_string('hidetypes', 'backup'));
+        }
+
+        // The link has now been toggled (from show to hide, or vice-versa).
+        modlist.currentlyshown = !modlist.currentlyshown;
+
+        // Either hide or show the links.
+        var animcfg = { node: modlist, duration: 0.2 },
+            anim;
+        if (modlist.currentlyshown) {
+            // Animate reveal of the module links.
+            modlist.show();
+            animcfg.to = { maxHeight: modlist.get('clientHeight') + 'px' };
+            modlist.setStyle('maxHeight', '0px');
+            anim = new Y.Anim(animcfg);
+            anim.on('end', function() { modlist.setStyle('maxHeight', 'none'); });
+            anim.run();
+        } else {
+            // Animate hide of the module links.
+            animcfg.to = { maxHeight: '0px' };
+            modlist.setStyle('maxHeight', modlist.get('clientHeight') + 'px');
+            anim = new Y.Anim(animcfg);
+            anim.on('end', function() { modlist.hide(); modlist.setStyle('maxHeight', 'none'); });
+            anim.run();
+        }
+
+    };
+    Y.one('#backup-bytype').on('click', function() { toggletypes(); });
+
+    Y.one('#backup-all-included').on('click',  function(e) { helper(e, true,  '_included'); });
+    Y.one('#backup-none-included').on('click', function(e) { helper(e, false, '_included'); });
+    if (withuserdata) {
+        Y.one('#backup-all-userdata').on('click',  function(e) { helper(e, true,  withuserdata); });
+        Y.one('#backup-none-userdata').on('click', function(e) { helper(e, false, withuserdata); });
+    }
+};
+
+
+}, '@VERSION@');

backup/util/ui/yui/src/backupselectall/build.json

@@ -0,0 +1,10 @@
+{
+  "name": "moodle-backup-backupselectall",
+  "builds": {
+    "moodle-backup-backupselectall": {
+      "jsfiles": [
+        "backupselectall.js"
+      ]
+    }
+  }
+}

backup/util/ui/yui/src/backupselectall/js/backupselectall.js

@@ -1,12 +1,18 @@
-YUI.add('moodle-backup-backupselectall', function(Y) {
+/**
+ * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @module moodle-backup-backupselectall
+ */
 
 // Namespace for the backup
 M.core_backup = M.core_backup || {};
 
 /**
  * Adds select all/none links to the top of the backup/restore/import schema page.
+ *
+ * @class M.core_backup.backupselectall
  */
-M.core_backup.select_all_init = function(modnames) {
+M.core_backup.backupselectall = function(modnames) {
     var formid = null;
 
     var helper = function(e, check, type, mod) {
@@ -23,7 +29,7 @@ M.core_backup.select_all_init = function(modnames) {
             if (prefix && name.substring(0, prefix.length) !== prefix) {
                 return;
             }
-            if (name.substring(name.length - len) == type) {
+            if (name.substring(name.length - len) === type) {
                 checkbox.set('checked', check);
             }
         });
@@ -67,9 +73,9 @@ M.core_backup.select_all_init = function(modnames) {
     var withuserdata = false;
     Y.all('input[type="checkbox"]').each(function(checkbox) {
         var name = checkbox.get('name');
-        if (name.substring(name.length - 9) == '_userdata') {
+        if (name.substring(name.length - 9) === '_userdata') {
             withuserdata = '_userdata';
-        } else if (name.substring(name.length - 9) == '_userinfo') {
+        } else if (name.substring(name.length - 9) === '_userinfo') {
             withuserdata = '_userinfo';
         }
     });
@@ -103,7 +109,7 @@ M.core_backup.select_all_init = function(modnames) {
         if (!modnames.hasOwnProperty(mod)) {
             continue;
         }
-        var html = html_generator('include_setting section_level', 'mod_' + mod, modnames[mod]);
+        html = html_generator('include_setting section_level', 'mod_' + mod, modnames[mod]);
         if (withuserdata) {
             html += html_generator('normal_setting', 'userdata-mod_' + mod, modnames[mod]);
         }
@@ -127,26 +133,27 @@ M.core_backup.select_all_init = function(modnames) {
         modlist.currentlyshown = !modlist.currentlyshown;
 
         // Either hide or show the links.
-        var animcfg = { node: modlist, duration: 0.2 };
+        var animcfg = { node: modlist, duration: 0.2 },
+            anim;
         if (modlist.currentlyshown) {
             // Animate reveal of the module links.
             modlist.show();
             animcfg.to = { maxHeight: modlist.get('clientHeight') + 'px' };
             modlist.setStyle('maxHeight', '0px');
-            var anim = new Y.Anim(animcfg);
+            anim = new Y.Anim(animcfg);
             anim.on('end', function() { modlist.setStyle('maxHeight', 'none'); });
             anim.run();
         } else {
             // Animate hide of the module links.
             animcfg.to = { maxHeight: '0px' };
             modlist.setStyle('maxHeight', modlist.get('clientHeight') + 'px');
-            var anim = new Y.Anim(animcfg);
+            anim = new Y.Anim(animcfg);
             anim.on('end', function() { modlist.hide(); modlist.setStyle('maxHeight', 'none'); });
             anim.run();
         }
 
     };
-    Y.one('#backup-bytype').on('click', function(e) { toggletypes(); });
+    Y.one('#backup-bytype').on('click', function() { toggletypes(); });
 
     Y.one('#backup-all-included').on('click',  function(e) { helper(e, true,  '_included'); });
     Y.one('#backup-none-included').on('click', function(e) { helper(e, false, '_included'); });
@@ -154,6 +161,4 @@ M.core_backup.select_all_init = function(modnames) {
         Y.one('#backup-all-userdata').on('click',  function(e) { helper(e, true,  withuserdata); });
         Y.one('#backup-none-userdata').on('click', function(e) { helper(e, false, withuserdata); });
     }
-}
-
-}, '@VERSION@', {'requires':['base', 'node', 'event', 'node-event-simulate', 'anim']});
+};

backup/util/ui/yui/src/backupselectall/js/backupselectall.json

@@ -0,0 +1,10 @@
+{
+  "moodle-backup-backupselectall": {
+    "requires": [
+        "node",
+        "event",
+        "node-event-simulate",
+        "anim"
+    ]
+  }
+}

backup/util/ui/yui/src/backupselectall/meta/backupselectall.json

@@ -0,0 +1,10 @@
+{
+  "moodle-backup-backupselectall": {
+    "requires": [
+        "node",
+        "event",
+        "node-event-simulate",
+        "anim"
+    ]
+  }
+}