Now works with font-awesome move icons rather than old images.

CHANGES.md

@@ -1,3 +1,39 @@
+## 3.5.4 ##
+
+* Missing language strings in settings page
+
+## 3.5.3 ##
+
+* New instances load in the 'content' area of the Dashboard automagically.
+* New option to select default tab
+* Performance improvements. User's course list is only loaded once for both tabs. 
+
+## 3.3.6 ##
+
+* Now displays hidden courses (to Teachers et al) as 'dimmed'
+* Layout a bit better on legacy Bootstrap 2 themes (e.g. Clean).
+
+## 3.3.5 ##
+
+* Some support for bootstrapbase themes added
+* favourites shown with correct 'star' in course list
+
+## 3.3.4 ##
+
+* Layout of courses improved using Bootstrap grids
+* Option to keep favourites in 'normal' course list added to block settings
+* Option to have a fixed sort order for courses tab
+* Code tidied up somewhat
+
+## 3.3.3 ##
+
+* All javascript changed from YUI to jquery amd modules
+* Rendering now using mustache templates
+* Course overviews displayed by clicking icon 
+* Favourites tab added
+* Limit on courses displayed and child course display dropped.
+* print_overview() still in use (for now)
+
 ## 3.3.1 ##
 
 * Debugging messages raised by using deprecated `print_overview()` are not

amd/src/edit.js

@@ -0,0 +1,62 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A javascript module to allow drag-and-drop control of course order
+ *
+ * @module     block_course_overview
+ * @class      block
+ * @package    block_course_overview
+ * @copyright  2017 Howard Miller <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define(['jquery', 'jqueryui'], function($, UI) {
+
+    return {
+        init: function() {
+
+            // Change non-js links to be inactive.
+            $(".courseovbox a").removeAttr("href");
+
+            // Make the course list sort.
+            $(".tab-pane .course-list").sortable({
+                update: function(event, ui) {
+                    var kids = $(".tab-pane.active .course-list").children();
+                    var sortorder = [];
+                    $.each(kids, function(index, value) {
+                        var id = value.getAttribute('id');
+                        sortorder[index] = id.substring(7);
+                    });
+
+                    // Send new sortorder.
+                    var activetab = $(".block_course_overview .nav-item.active a").data("tabname");
+                    if (!activetab) {
+                        var activetab = $(".block_course_overview .nav-tabs .active").data("tabname");
+                    }
+                    var data = {
+                        sesskey : M.cfg.sesskey,
+                        tab : activetab,
+                        sortorder : sortorder
+                    };
+                    $.post(
+                        M.cfg.wwwroot + '/blocks/course_overview/save.php',
+                        data
+                    );
+                }
+            });
+        }
+    };
+});

amd/src/popup.js

@@ -0,0 +1,54 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A javascript module to popup activity overviews
+ *
+ * @module     block_course_overview
+ * @class      block
+ * @package    block_course_overview
+ * @copyright  2017 Howard Miller <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define(['jquery', 'jqueryui', 'core/config'], function($, UI, mdlconfig) {
+
+    return {
+        init: function() {
+
+            // Dialogues on activity icons.
+            $(".dialogue").dialog({
+                autoOpen: false,
+                minWidth: 400,
+                classes: {
+                    'ui-dialog': 'course-overview-dialog'
+                },
+                closeText: '',
+                modal: true
+            });
+
+            // Opens the appropriate dialog.
+            $(".overview-icon").click(function () {
+
+                // Takes the ID of appropriate dialogue.
+                var id = $(this).data('id');
+
+                // Open dialogue.
+                $(id).dialog("open");
+            });
+
+        }
+    };
+});

block_course_overview.php

@@ -21,7 +21,8 @@
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once($CFG->dirroot.'/blocks/course_overview/locallib.php');
+
+defined('MOODLE_INTERNAL') || die();
 
 /**
  * Course overview block
@@ -48,10 +49,12 @@ public function init() {
      * @return stdClass contents of block
      */
     public function get_content() {
-        global $USER, $CFG, $DB;
+        global $USER, $CFG, $DB, $SESSION;
+
+        require_once($CFG->dirroot.'/blocks/course_overview/locallib.php');
         require_once($CFG->dirroot.'/user/profile/lib.php');
 
-        if($this->content !== NULL) {
+        if ($this->content !== null) {
             return $this->content;
         }
 
@@ -63,37 +66,74 @@ public function get_content() {
 
         $content = array();
 
+        $isediting = $this->page->user_is_editing();
+
         $updatemynumber = optional_param('mynumber', -1, PARAM_INT);
         if ($updatemynumber >= 0 && optional_param('sesskey', '', PARAM_RAW) && confirm_sesskey()) {
             block_course_overview_update_mynumber($updatemynumber);
         }
 
         profile_load_custom_fields($USER);
 
-        $showallcourses = ($updatemynumber === self::SHOW_ALL_COURSES);
-        list($sortedcourses, $sitecourses, $totalcourses) = block_course_overview_get_sorted_courses($showallcourses);
-        $overviews = block_course_overview_get_overviews($sitecourses);
+        // Check if favourite added/removed.
+        $favourite = optional_param('favourite', 0, PARAM_INT);
+        if ($favourite) {
+            block_course_overview_add_favourite($favourite);
+        }
+        $unfavourite = optional_param('unfavourite', 0, PARAM_INT);
+        if ($unfavourite) {
+            block_course_overview_remove_favourite($unfavourite);
+        }
 
-        $renderer = $this->page->get_renderer('block_course_overview');
-        if (!empty($config->showwelcomearea)) {
-            require_once($CFG->dirroot.'/message/lib.php');
-            $msgcount = message_count_unread_messages();
-            $this->content->text = $renderer->welcome_area($msgcount);
+        // Check if sortorder updated.
+        $soparam = optional_param('sortorder', -1, PARAM_INT);
+        if ($soparam == -1) {
+            $sortorder = block_course_overview_get_sortorder();
+        } else {
+            $sortorder = $soparam;
+            block_course_overview_update_sortorder($sortorder);
         }
 
-        // Number of sites to display.
-        if ($this->page->user_is_editing() && empty($config->forcedefaultmaxcourses)) {
-            $this->content->text .= $renderer->editing_bar_head($totalcourses);
+        // Check if number of courses to display was updated.
+        $usersetmaxcourses = optional_param('usersetmaxcourses', null, PARAM_INT);
+        if ( $usersetmaxcourses === null ) {
+            $usersetmaxcourses = block_course_overview_get_usersetmaxcourses();
+        } else {
+            block_course_overview_update_usersetmaxcourses($usersetmaxcourses);
         }
 
-        if (empty($sortedcourses)) {
-            $this->content->text .= get_string('nocourses','my');
+        // Get data for favourites and course tab.
+        $tabs = array();
+        $ftab = new stdClass;
+        $ftab->tab = 'favourites';
+        list($ftab->sortedcourses, $ftab->sitecourses, $ftab->totalcourses) = block_course_overview_get_sorted_courses(true);
+        $ftab->overviews = block_course_overview_get_overviews($ftab->sortedcourses);
+        $ctab = new stdClass;
+        $ctab->tab = 'courses';
+        list($ctab->sortedcourses, $ctab->sitecourses, $ctab->totalcourses)
+            = block_course_overview_get_sorted_courses(false, $config->keepfavourites, array_keys($ftab->sortedcourses));
+        $ctab->overviews = block_course_overview_get_overviews($ctab->sortedcourses);
+        $tabs = array(
+            'favourites' => $ftab,
+            'courses' => $ctab,
+        );
+
+        // Get list of favourites.
+        $favourites = array_keys($ftab->sortedcourses);
+
+        // Default tab. One with something in it or selected default.
+        if (($config->defaulttab == BLOCKS_COURSE_OVERVIEW_DEFAULT_FAVOURITES) && $ftab->totalcourses) {
+            $tab = 'favourites';
         } else {
-            // For each course, build category cache.
-            $this->content->text .= $renderer->course_overview($sortedcourses, $overviews);
-            $this->content->text .= $renderer->hidden_courses($totalcourses - count($sortedcourses));
+            $tab = 'courses';
         }
 
+        $renderer = $this->page->get_renderer('block_course_overview');
+
+        // Render block.
+        $main = new block_course_overview\output\main(
+            $config, $tabs, $isediting, $tab, $sortorder, $favourites, $usersetmaxcourses);
+        $this->content->text .= $renderer->render($main);
         return $this->content;
     }
 
@@ -121,8 +161,22 @@ public function applicable_formats() {
      * @return bool if true then header will be visible.
      */
     public function hide_header() {
-        // Hide header if welcome area is show.
-        $config = get_config('block_course_overview');
-        return !empty($config->showwelcomearea);
+        return false;
+    }
+
+    /**
+     * Do any additional initialization you may need at the time a new block instance is created
+     * @return boolean
+     */
+    public function instance_create() {
+        global $DB;
+
+        // Bodge? Modify our own instance to make the default region the
+        // content area, not the side bar.
+        $instance = $this->instance;
+        $instance->defaultregion = 'content';
+        $DB->update_record('block_instances', $instance);
+
+        return true;
     }
 }