diff --git a/CHANGES.md b/CHANGES.md
index 42692f3394a1ba889c73e5d16200f11dc1bcb621..0f740a2d1c725b9874b6b46124006c2d5d44221c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
### Unreleased
+* 2019-06-12 - Remove course news functionality as it does not work anymore from Moodle 3.7 on.
* 2019-06-12 - Prepare compatibility for Moodle 3.7.
### v3.6-r1
diff --git a/README.md b/README.md
index 072be0f4b442e30ad65bdc514ecb3525a54001c5..2d7b2c2706ae494a312a21de1194ddb5afcaf474 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ moodle-block_course_overview_campus
[](https://travis-ci.org/moodleuulm/moodle-block_course_overview_campus)
-Moodle block which provides all functionality of block_course_overview, provides additional filters to be used on university campuses as well as the possibility to hide courses and course news from the course list
+Moodle block which provides all functionality of block_course_overview, provides additional filters to be used on university campuses as well as the possibility to hide courses from the course list
Requirements
@@ -32,7 +32,7 @@ Usage & Settings
After installing the plugin, it can be directly used by users and can be added to the Moodle dashboard and to the Moodle frontpage.
-Initially, it behaves like block_course_overview from moodle core. Additionally, news from your courses can be folded and unfolded and courses can be hidden from the course list.
+Initially, it behaves like block_course_overview from moodle core. Additionally, courses can be hidden from the course list.
To make use of the advanced features of the block, please visit:
Site administration -> Plugins -> Blocks -> Course overview on campus
@@ -51,27 +51,23 @@ On this settings page, you can change the appearance of the course overview list
On this settings page, you can enable (default) or disable the system for hiding courses from the course overview list.
-### 4. Course news
-
-On this settings page, you can configure if the course list should also show course news. Additionally, you can configure which and how course news are displayed.
-
-### 5. Teacher roles
+### 4. Teacher roles
On this settings page, you can define which roles in a course will be displayed besides the course's name as teacher and get listed in the teacher filter.
-### 6. Parent category filter
+### 5. Parent category filter
On this settings page, you can activate and configure a filter which enables your users to filter their courses by parent category. As soon as the filter is activated and the setting is saved, the filter appears in the block view.
-### 7. Top level category filter
+### 6. Top level category filter
On this settings page, you can activate and configure a filter which enables your users to filter their courses by top level category. As soon as the filter is activated and the setting is saved, the filter appears in the block view.
-### 8. Teacher filter
+### 7. Teacher filter
On this settings page, you can activate and configure a filter which enables your users to filter their courses by teacher. As soon as the filter is activated and the setting is saved, the filter appears in the block view.
-### 9. Term filter
+### 8. Term filter
On this settings page, you can activate and configure a filter which enables your users to filter their courses by term. As soon as the filter is activated and the setting is saved, the filter appears in the block view.
@@ -102,12 +98,6 @@ As described in the "Usage & Settings" section of this file, you should configur
As described in the "Usage & Settings" section of this file, you should configure block_course_overview_campus according to your campus course of the year. After that, block_course_overview_campus maps each course to a term by looking at the course's start date. This term is filled into the term filter.
-### 5. Course news
-
-The course news feature displays course news from the activities within each of your courses. This is done by using the *_print_overview() hook which is implemented by most of Moodle core's and third party activity modules.
-
-Please note that the *_print_overview() hook was deprecated in Moodle core when the MyOverview block was introduced. If you have enabled course news in block_course_overview_campus and if you have also enabled debugging with DEVELOPER level, you will see deprecation warnings whenever block_course_overview_campus calls a *_print_overview() function. For Moodle 3.6, this does not mean that the course news feature is already broken. However, Moodle core will remove the *_print_overview() functions in Moodle 3.7 (see MDL-57487). If installed on Moodle 3.7, this plugin will silently disable the course news feature even if it is enabled in the plugin settings.
-
Block placement
---------------
@@ -126,7 +116,6 @@ During the development of Moodle, there have been added several features added t
* In block_course_overview in Moodle 2.4+, a user is able to limit the length of his course list with a block setting. We decided to not adopt this feature for block_course_overview_campus because we think this would conflict with the filtering / hiding feature and confuse users. In block_course_overview_campus, the course list always shows all courses which have passed the selected course filters.
* In block_course_overview in Moodle 2.4+, the administrator can configure the block to show Metacourse children. We decided to not adopt this feature for block_course_overview_campus because we have no need for this. If you need this feature, please let us know on https://github.com/moodleuulm/moodle-block_course_overview_campus/issues
* In block_course_overview in Moodle 2.4+, the administrator can configure the block to show a welcome message. We decided to not adopt this feature for block_course_overview_campus because we have no need for this. If you need this feature, please let us know on https://github.com/moodleuulm/moodle-block_course_overview_campus/issues
-* In block_course_overview in Moodle 2.4+, course news are grouped by modules and each module can be collapsed / expanded. We decided to stick with the behaviour of block_course_overview_campus to collapse / expand course news as a whole, but we added some nice icons for each module to the course news list.
* In Moodle core since Moodle 2.2+, there is a setting "courselistshortnames" which controls the displaying of course names. This setting is also processed in block_course_overview. We decided to ignore this core setting and to stick to block_course_overview_campus's internal course display control settings.
* In contrast to the Moodle core block_course_overview, this block doesn't support MNet courses and wasn't tested with MNet Moodle installations.
diff --git a/amd/build/hidenews.min.js b/amd/build/hidenews.min.js
deleted file mode 100644
index 8ed3b41974a5b22d0ec39cc94c4954d2097e0134..0000000000000000000000000000000000000000
--- a/amd/build/hidenews.min.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["jquery"],function(a){"use strict";function b(b){void 0!==b&&b.preventDefault(),a("#coc-coursenews-"+b.data.course).addClass("coc-hidden"),a("#coc-hidenewsicon-"+b.data.course).addClass("coc-hidden"),a("#coc-shownewsicon-"+b.data.course).removeClass("coc-hidden"),M.util.set_user_preference("block_course_overview_campus-hidenews-"+b.data.course,1)}function c(b){void 0!==b&&b.preventDefault(),a("#coc-coursenews-"+b.data.course).removeClass("coc-hidden"),a("#coc-hidenewsicon-"+b.data.course).removeClass("coc-hidden"),a("#coc-shownewsicon-"+b.data.course).addClass("coc-hidden"),M.util.set_user_preference("block_course_overview_campus-hidenews-"+b.data.course,0)}return{initHideNews:function(d){var e,f=d.courses.split(" ");for(e=0;e<f.length;e++)a("#coc-hidenewsicon-"+f[e]).on("click",{course:f[e]},b),a("#coc-shownewsicon-"+f[e]).on("click",{course:f[e]},c)}}});
\ No newline at end of file
diff --git a/amd/src/hidenews.js b/amd/src/hidenews.js
deleted file mode 100644
index 4118a891f434481b542cc4190efa52b0a3a6c7cb..0000000000000000000000000000000000000000
--- a/amd/src/hidenews.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Block "course overview (campus)" - JS code for hiding course news
- *
- * @package block_course_overview_campus
- * @copyright 2013 Alexander Bias, Ulm University <alexander.bias@uni-ulm.de>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define(['jquery'], function($) {
- "use strict";
-
- /**
- * Function to hide news from a course.
- */
- function hideNews(e) {
- // Prevent the event from refreshing the page.
- if (e !== undefined) {
- e.preventDefault();
- }
-
- $('#coc-coursenews-' + e.data.course).addClass('coc-hidden');
- $('#coc-hidenewsicon-' + e.data.course).addClass('coc-hidden');
- $('#coc-shownewsicon-' + e.data.course).removeClass('coc-hidden');
-
- // Store the course news status (Uses AJAX to save to the database).
- M.util.set_user_preference('block_course_overview_campus-hidenews-' + e.data.course, 1);
- }
-
- /**
- * Function to show news for a course.
- */
- function showNews(e) {
- // Prevent the event from refreshing the page.
- if (e !== undefined) {
- e.preventDefault();
- }
-
- $('#coc-coursenews-' + e.data.course).removeClass('coc-hidden');
- $('#coc-hidenewsicon-' + e.data.course).removeClass('coc-hidden');
- $('#coc-shownewsicon-' + e.data.course).addClass('coc-hidden');
-
- // Store the course news status (Uses AJAX to save to the database).
- M.util.set_user_preference('block_course_overview_campus-hidenews-' + e.data.course, 0);
- }
-
- return {
- initHideNews: function(params) {
- var i;
- var courses = params.courses.split(" ");
- for (i = 0; i < courses.length; i++) {
- // Add change listener to hide course news widgets.
- $('#coc-hidenewsicon-' + courses[i]).on('click', {course: courses[i]}, hideNews);
- // Add change listener to show course news widgets.
- $('#coc-shownewsicon-' + courses[i]).on('click', {course: courses[i]}, showNews);
- }
- }
- };
-});
diff --git a/block_course_overview_campus.php b/block_course_overview_campus.php
index f4238d31b9cbecab92a941833774d76f644b9004..306c63f69e69140af1c37b2e06113caa91f7f5d5 100644
--- a/block_course_overview_campus.php
+++ b/block_course_overview_campus.php
@@ -126,8 +126,6 @@ class block_course_overview_campus extends block_base {
// Process GET parameters.
$param_hidecourse = optional_param('coc-hidecourse', 0, PARAM_BOOL);
$param_showcourse = optional_param('coc-showcourse', 0, PARAM_BOOL);
- $param_hidenews = optional_param('coc-hidenews', 0, PARAM_BOOL);
- $param_shownews = optional_param('coc-shownews', 0, PARAM_BOOL);
$param_term = optional_param('coc-term', null, PARAM_ALPHANUMEXT);
$param_category = optional_param('coc-category', null, PARAM_ALPHANUM);
$param_toplevelcategory = optional_param('coc-toplevelcategory', null, PARAM_ALPHANUM);
@@ -144,14 +142,6 @@ class block_course_overview_campus extends block_base {
set_user_preference('block_course_overview_campus-hidecourse-'.$param_showcourse, 0);
}
}
- if ($coc_config->enablecoursenews) {
- if ($param_hidenews != 0) {
- set_user_preference('block_course_overview_campus-hidenews-'.$param_hidenews, 1);
- }
- if ($param_shownews != 0) {
- set_user_preference('block_course_overview_campus-hidenews-'.$param_shownews, 0);
- }
- }
// Set and remember term filter if GET parameter is present.
@@ -230,20 +220,6 @@ class block_course_overview_campus extends block_base {
ob_start();
- // Get course news from my courses for later use.
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- // Get lastaccess of my courses to support course news.
- foreach ($courses as $c) {
- if (isset($USER->lastcourseaccess[$c->id])) {
- $courses[$c->id]->lastaccess = $USER->lastcourseaccess[$c->id];
- } else {
- $courses[$c->id]->lastaccess = 0;
- }
- }
- // Get course news html array.
- $coursenews = block_course_overview_campus_get_overviews($courses, $coc_config->skipcoursenews);
- }
-
// Get all course categories for later use.
$coursecategories = $DB->get_records('course_categories');
@@ -278,11 +254,6 @@ class block_course_overview_campus extends block_base {
// Create string to remember courses for JS processing.
$js_courseslist = ' ';
- // Create string to remember course news for JS processing.
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- $js_coursenewslist = ' ';
- }
-
// Now iterate over my courses and collect data about them.
foreach ($courses as $c) {
@@ -631,11 +602,6 @@ class block_course_overview_campus extends block_base {
$courses[$c->id]->teachercoursefiltered = block_course_overview_campus_course_hidden_by_teachercoursefilter($c, $selectedteacher);
}
- // Check if this course should show news or not.
- if ($coc_config->enablecoursenews == true && $param_manage == 0) {
- $courses[$c->id]->hidenews = block_course_overview_campus_coursenews_hidden($c);
- }
-
// Re-sort courses to list courses in which I have a teacher role first if configured:
// First step: Removing the courses.
@@ -1205,26 +1171,6 @@ class block_course_overview_campus extends block_base {
// Start standard course overview coursebox.
echo $OUTPUT->box_start('coursebox');
- // Output course news visibility control icons.
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- if (array_key_exists($c->id, $coursenews)) {
- // If course news are hidden.
- if ($c->hidenews == false) {
- echo '<div class="hidenewsicon">
- <a href="'.$CFG->wwwroot.$PAGE->url->out_as_local_url(true, array('coc-manage' => $param_manage, 'coc-hidenews' => $c->id, 'coc-shownews' => '')).'" id="coc-hidenewsicon-'.$c->id.'" title="'.get_string('hidenews', 'block_course_overview_campus').'">'.$OUTPUT->pix_icon('expanded', get_string('hidenews', 'block_course_overview_campus'), 'block_course_overview_campus').'</a>
- <a href="'.$CFG->wwwroot.$PAGE->url->out_as_local_url(true, array('coc-manage' => $param_manage, 'coc-hidenews' => '', 'coc-shownews' => $c->id)).'" id="coc-shownewsicon-'.$c->id.'" class="coc-hidden" title="'.get_string('shownews', 'block_course_overview_campus').'">'.$OUTPUT->pix_icon('collapsed', get_string('shownews', 'block_course_overview_campus'), 'block_course_overview_campus').'</a>
- </div>';
- }
- // If course news are visible.
- else {
- echo '<div class="hidenewsicon">
- <a href="'.$CFG->wwwroot.$PAGE->url->out_as_local_url(true, array('coc-manage' => $param_manage, 'coc-hidenews' => $c->id, 'coc-shownews' => '')).'" id="coc-hidenewsicon-'.$c->id.'" class="coc-hidden" title="'.get_string('hidenews', 'block_course_overview_campus').'">'.$OUTPUT->pix_icon('expanded', get_string('hidenews', 'block_course_overview_campus'), 'block_course_overview_campus').'</a>
- <a href="'.$CFG->wwwroot.$PAGE->url->out_as_local_url(true, array('coc-manage' => $param_manage, 'coc-hidenews' => '', 'coc-shownews' => $c->id)).'" id="coc-shownewsicon-'.$c->id.'" title="'.get_string('shownews', 'block_course_overview_campus').'">'.$OUTPUT->pix_icon('collapsed', get_string('shownews', 'block_course_overview_campus'), 'block_course_overview_campus').'</a>
- </div>';
- }
- }
- }
-
// Output course visibility control icons.
if ($coc_config->enablehidecourses) {
// If course is hidden.
@@ -1302,44 +1248,6 @@ class block_course_overview_campus extends block_base {
}
- // Output course news.
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- if (array_key_exists($c->id, $coursenews)) {
- // Remember course ID for JS processing.
- $js_coursenewslist .= $c->id.' ';
-
- // Start course news div as visible if the course's news aren't hidden.
- if ($c->hidenews == false) {
- echo '<div id="coc-coursenews-'.$c->id.'" class="coc-coursenews">';
- }
- // Otherwise start course news div as hidden.
- else {
- echo '<div id="coc-coursenews-'.$c->id.'" class="coc-coursenews coc-hidden">';
- }
-
- // Output the course's preformatted news HTML.
- foreach ($coursenews[$c->id] as $modname => $html) {
- echo '<div class="coc-module">';
- // Output activity icon.
- echo $OUTPUT->image_icon('icon', $modname, 'mod_'.$modname, array('class' => 'iconlarge activityicon'));
-
- // Output activity introduction string.
- if (get_string_manager()->string_exists("activityoverview", $modname)) {
- echo '<div class="overview">'.get_string("activityoverview", $modname).'</div>';
- } else {
- echo '<div class="overview">'.get_string("activityoverview", 'block_course_overview_campus', get_string('modulename', $modname)).'</div>';
- }
-
- // Output activity news.
- echo $html;
- echo '</div>';
- }
-
- // End course news div.
- echo '</div>';
- }
- }
-
// End standard course overview coursebox.
echo $OUTPUT->box_end();
@@ -1418,9 +1326,6 @@ class block_course_overview_campus extends block_base {
if ($coc_config->enablehidecourses) {
user_preference_allow_ajax_update('block_course_overview_campus-hidecourse-'.$c->id, PARAM_BOOL);
}
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- user_preference_allow_ajax_update('block_course_overview_campus-hidenews-'.$c->id, PARAM_BOOL);
- }
}
// Verify that filter parameters are updatable by AJAX.
@@ -1447,15 +1352,6 @@ class block_course_overview_campus extends block_base {
$PAGE->requires->js_call_amd('block_course_overview_campus/hidecourse', 'initHideCourse', [$js_hidecoursesoptions]);
}
- // Include JS for hiding course news with AJAX.
- if ($coc_config->enablecoursenews && $param_manage == 0) {
- $js_coursenewsoptions = [
- 'courses' => trim($js_coursenewslist),
- ];
-
- $PAGE->requires->js_call_amd('block_course_overview_campus/hidenews', 'initHideNews', [$js_coursenewsoptions]);
- }
-
// Include JS for filtering courses with AJAX.
if ($coc_config->teachercoursefilter == true || $coc_config->termcoursefilter == true || $coc_config->categorycoursefilter == true || $coc_config->toplevelcategorycoursefilter == true) {
$js_filteroptions = [
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index 4459944efff1efbb70270d9d89bd3e01f7ffb4f9..a3ad017d2ea8c2a352fb746b753772cf608558a8 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -57,8 +57,6 @@ class provider implements \core_privacy\local\metadata\provider,
'privacy:metadata:preference:selectedtoplevelcategory');
$collection->add_user_preference('block_course_overview_campus-hidecourse-',
'privacy:metadata:preference:hidecourse');
- $collection->add_user_preference('block_course_overview_campus-hidenews-',
- 'privacy:metadata:preference:hidenews');
$collection->add_user_preference('local_boostcoc-notshowncourses',
'privacy:metadata:preference:local_boostcoc-notshowncourses');
$collection->add_user_preference('local_boostcoc-activefilters',
@@ -105,9 +103,6 @@ class provider implements \core_privacy\local\metadata\provider,
if (strpos($name, 'block_course_overview_campus-hidecourse-') === 0) {
$descriptionidentifier = 'privacy:request:preference:hidecourse';
$item = substr($name, strlen('block_course_overview_campus-hidecourse-'));
- } else if (strpos($name, 'block_course_overview_campus-hidenews-') === 0) {
- $descriptionidentifier = 'privacy:request:preference:hidenews';
- $item = substr($name, strlen('block_course_overview_campus-hidecourse-'));
}
if ($descriptionidentifier !== null) {
diff --git a/db/upgrade.php b/db/upgrade.php
new file mode 100644
index 0000000000000000000000000000000000000000..9eea2a3eb2b61ba22c6a1c43fc50891e3f69362c
--- /dev/null
+++ b/db/upgrade.php
@@ -0,0 +1,49 @@
+<?php
+// 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/>.
+
+/**
+ * Block "course overview (campus)" - Upgrade script
+ *
+ * @package block_course_overview_campus
+ * @copyright 2019 Alexander Bias, Ulm University <alexander.bias@uni-ulm.de>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Function to upgrade block_course_overview_campus.
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
+function xmldb_block_course_overview_campus_upgrade($oldversion) {
+ global $DB;
+
+ if ($oldversion < 2019061200) {
+ // After the course news functionality has been removed from the plugin, the user preferences have to be removed manually.
+ // We remove them directly from the DB table and don't use unset_user_preference() as the cache is cleared anyway directly
+ // after the plugin has been uninstalled.
+
+ $like = $DB->sql_like('name', '?', true, true, false, '|');
+ $params = array($DB->sql_like_escape('block_course_overview_campus-hidenews-', '|') . '%');
+ $DB->delete_records_select('user_preferences', $like, $params);
+
+ upgrade_plugin_savepoint(true, 2019061200, 'block', 'course_overview_campus');
+ }
+
+ return true;
+}
+
diff --git a/lang/en/block_course_overview_campus.php b/lang/en/block_course_overview_campus.php
index bc0668d7eb2d16809cf2c006fb4357df7a1c8cfa..6b74ccf1150ade8d1c9221ba9b2c2fff5685e5a3 100644
--- a/lang/en/block_course_overview_campus.php
+++ b/lang/en/block_course_overview_campus.php
@@ -37,15 +37,10 @@ $string['categorycoursefilter_desc'] = 'Allow users to filter courses by parent
$string['categorycoursefilterdisplayname'] = 'Display name for parent category filter';
$string['categorycoursefilterdisplayname_desc'] = 'This display name is shown above the parent category filter<br /><em>This setting is only processed when the parent category filter is activated</em>';
$string['categorycoursefiltersettingheading'] = 'Parent category filter: Filter activation';
-$string['coursenewsheading'] = 'Course news';
-$string['coursenewsdefault'] = 'Hide course news by default';
-$string['coursenewsdefault_desc'] = 'If enabled, course news are hidden by default to prevent cluttered course lists. If disabled, course news are shown / expanded by default to catch the user\'s eye. As soon as a user hides / shows a course\'s news, this setting isn\'t relevant anymore for this course<br /><em>This setting is only processed when enable course news is activated</em>';
$string['course_overview_campus:addinstance'] = 'Add a new course overview campus block';
$string['course_overview_campus:myaddinstance'] = 'Add a new course overview campus block to Dashboard';
$string['defaultterm'] = 'Use default term';
$string['defaultterm_desc'] = 'If the user has not previously selected a term for filtering terms, a term is chosen for him. The first choice is the current term. If the user is not enrolled on any courses in the current term, the most recent previous term is chosen.<br /><em>This setting is only processed when the term filter is activated</em>';
-$string['enablecoursenews'] = 'Enable course news';
-$string['enablecoursenews_desc'] = 'Enable course news below the course name in the course list if there are news in the course';
$string['enablehidecourses'] = 'Enable course hiding';
$string['enablehidecourses_desc'] = 'Enable course hiding, which lets users hide courses from the course overview list';
$string['firstrowcoursename'] = 'First row: Course name style';
@@ -53,7 +48,6 @@ $string['firstrowcoursename_desc'] = 'Show the course\'s full name or the course
$string['hiddencourses'] = 'hidden courses';
$string['hidecourse'] = 'Hide course in course overview list';
$string['hidecoursessettingheading'] = 'Hide courses';
-$string['hidenews'] = 'Hide course news';
$string['listentriessettingheading'] = 'Course overview list: Entries';
$string['managehiddencourses'] = 'Manage hidden courses';
$string['mergehomonymouscategories'] = 'Merge homonymous parent categories';
@@ -73,7 +67,6 @@ $string['privacy:metadata:preference:selectedteacher'] = 'The current selection
$string['privacy:metadata:preference:selectedcategory'] = 'The current selection of the parent category filter.';
$string['privacy:metadata:preference:selectedtoplevelcategory'] = 'The current selection of the top level category filter.';
$string['privacy:metadata:preference:hidecourse'] = 'The show/hide status of a course in the course overview list.';
-$string['privacy:metadata:preference:hidenews'] = 'The show/hide status of a course\'s course news in the course overview list.';
$string['privacy:metadata:preference:local_boostcoc-notshowncourses'] = 'The list of currently not shown courses to be used in the companion plugin \'Boost course overview campus\'.';
$string['privacy:metadata:preference:local_boostcoc-activefilters'] = 'The list of currently active filters to be used in the companion plugin \'Boost course overview campus\'.';
$string['privacy:request:preference:selectedterm'] = 'The current selection of the term filter is: {$a->value}.';
@@ -81,7 +74,6 @@ $string['privacy:request:preference:selectedteacher'] = 'The current selection o
$string['privacy:request:preference:selectedcategory'] = 'The current selection of the parent category filter is: {$a->value}.';
$string['privacy:request:preference:selectedtoplevelcategory'] = 'The current selection of the top level category filter is: {$a->value}.';
$string['privacy:request:preference:hidecourse'] = 'The show/hide status of the course {$a->item} in the course overview list is: {$a->value}.';
-$string['privacy:request:preference:hidenews'] = 'The show/hide status of course {$a->item}\'s course news in the course overview list is: {$a->value}.';
$string['privacy:request:preference:local_boostcoc-notshowncourses'] = 'The list of currently not shown courses to be used in the companion plugin \'Boost course overview campus\' is: {$a->value}.';
$string['privacy:request:preference:local_boostcoc-activefilters'] = 'The list of currently active filters to be used in the companion plugin \'Boost course overview campus\' is: {$a->value}.';
$string['secondrowhideonphones'] = 'Second row: Hide on phones';
@@ -102,16 +94,12 @@ $string['semester_desc'] = 'Semester (Calendar year is divided into two terms)';
$string['settingspage_general'] = 'General';
$string['settingspage_courseoverviewlist'] = 'Course overview list';
$string['settingspage_hidecourses'] = 'Hide courses';
-$string['settingspage_coursenews'] = 'Course news';
$string['settingspage_teacherroles'] = 'Teacher roles';
$string['settingspage_categoryfilter'] = 'Parent category filter';
$string['settingspage_toplevelcategoryfilter'] = 'Top level category filter';
$string['settingspage_teacherfilter'] = 'Teacher filter';
$string['settingspage_termfilter'] = 'Term filter';
$string['showcourse'] = 'Show course';
-$string['shownews'] = 'Show course news';
-$string['skipcoursenews'] = 'Skip course news';
-$string['skipcoursenews_desc'] = 'When collecting and displaying course news, news from the selected activities will be skipped<br /><em>This setting is only processed when enable course news is activated</em>';
$string['stopmanaginghiddencourses'] = 'Stop managing hidden courses';
$string['submitfilter'] = 'Filter my courses!';
$string['teachercoursefilter'] = 'Activate teacher filter';
diff --git a/locallib.php b/locallib.php
index d398735505c4847a3c8760f08ff401f2c936967d..e71426550d7e507865e90b8d3f8c90c2e1e646f1 100644
--- a/locallib.php
+++ b/locallib.php
@@ -64,25 +64,6 @@ function block_course_overview_campus_course_hidden_by_hidecourses($course) {
}
-/**
- * Check if course news are hidden for this course
- *
- * @param course $course
- * @return boolean
- */
-function block_course_overview_campus_coursenews_hidden($course) {
- // Course news are hidden if the user wanted it for this course or if they are hidden by default.
- if (get_user_preferences('block_course_overview_campus-hidenews-'.$course->id,
- get_config('block_course_overview_campus', 'coursenewsdefault')) == 1) {
- return true;
-
- // Otherwise it is visible.
- } else {
- return false;
- }
-}
-
-
/**
* Check if course is hidden according to the term course filter
*
@@ -176,46 +157,6 @@ function block_course_overview_campus_course_hidden_by_anyfilter($course) {
}
-/**
- * Get course news for courses (copied from /blocks/course_overview/locallib.php)
- *
- * @param array $courses courses for which course news need to be shown
- * @param array $skip modules which should be skipped
- * @return array html overview
- */
-function block_course_overview_campus_get_overviews($courses, $skip) {
- global $CFG;
-
- $htmlarray = array();
-
- // The hooks for fetching the course news will be removed in Moodle 3.7 (see MDL-57487).
- // So, we fetch course news only on Moodle 3.6.
- if ((int)$CFG->branch < 37 && $modules = get_plugin_list_with_function('mod', 'print_overview')) {
- // Remove modules which should be skipped.
- $skipmodules = explode(',', $skip);
- if (is_array($skipmodules)) {
- foreach ($skipmodules as $s) {
- unset($modules[$s]);
- }
- }
-
- // Split courses list into batches with no more than MAX_MODINFO_CACHE_SIZE courses in one batch.
- // Otherwise we exceed the cache limit in get_fast_modinfo() and rebuild it too often.
- if (defined('MAX_MODINFO_CACHE_SIZE') && MAX_MODINFO_CACHE_SIZE > 0 && count($courses) > MAX_MODINFO_CACHE_SIZE) {
- $batches = array_chunk($courses, MAX_MODINFO_CACHE_SIZE, true);
- } else {
- $batches = array($courses);
- }
- foreach ($batches as $courses) {
- foreach ($modules as $fname) {
- $fname($courses, $htmlarray);
- }
- }
- }
- return $htmlarray;
-}
-
-
/**
* Check if the configured term dates make sense
*
diff --git a/settings.php b/settings.php
index 253754b12bd71c1a4c1ad8c4dddad44c7fe91bc8..6a0bcd450a67317d5851782440e5dee901fe3072 100644
--- a/settings.php
+++ b/settings.php
@@ -55,11 +55,6 @@ if ($hassiteconfig) {
get_string('settingspage_hidecourses', 'block_course_overview_campus', null, true));
$ADMIN->add('block_course_overview_campus', $settingspage);
- // Settings page: Course news.
- $settingspage = new admin_settingpage('block_course_overview_campus_coursenews',
- get_string('settingspage_coursenews', 'block_course_overview_campus', null, true));
- $ADMIN->add('block_course_overview_campus', $settingspage);
-
// Settings page: Teacher roles.
$settingspage = new admin_settingpage('block_course_overview_campus_teacherroles',
get_string('settingspage_teacherroles', 'block_course_overview_campus', null, true));
@@ -209,43 +204,6 @@ if ($hassiteconfig) {
- // Settings page: Course news.
- $settingspage = new admin_settingpage('block_course_overview_campus_coursenews',
- get_string('settingspage_coursenews', 'block_course_overview_campus', null, true));
-
- // Course news.
- $settingspage->add(new admin_setting_heading('block_course_overview_campus/coursenewsheading',
- get_string('coursenewsheading', 'block_course_overview_campus', null, true),
- ''));
-
- $settingspage->add(new admin_setting_configcheckbox('block_course_overview_campus/enablecoursenews',
- get_string('enablecoursenews', 'block_course_overview_campus', null, true),
- get_string('enablecoursenews_desc', 'block_course_overview_campus', null, true),
- 1));
-
- $settingspage->add(new admin_setting_configcheckbox('block_course_overview_campus/coursenewsdefault',
- get_string('coursenewsdefault', 'block_course_overview_campus', null, true),
- get_string('coursenewsdefault_desc', 'block_course_overview_campus', null, true),
- 0));
-
- // Get activities which provide course news.
- $modules = get_plugin_list_with_function('mod', 'print_overview');
- $modchoices = array();
- foreach ($modules as $m => $f) {
- $modchoices[$m] = get_string('pluginname', $m);
- }
-
- $settingspage->add(new admin_setting_configmultiselect('block_course_overview_campus/skipcoursenews',
- get_string('skipcoursenews', 'block_course_overview_campus', null, true),
- get_string('skipcoursenews_desc', 'block_course_overview_campus', null, true),
- array(),
- $modchoices));
-
- // Add settings page to the admin settings category.
- $ADMIN->add('block_course_overview_campus', $settingspage);
-
-
-
// Settings page: Teacher roles.
$settingspage = new admin_settingpage('block_course_overview_campus_teacherroles',
get_string('settingspage_teacherroles', 'block_course_overview_campus', null, true));
diff --git a/styles.css b/styles.css
index f1dc8f3c4e088e3b242aa5c133069a968041e242..a71c9e046d43c472c2e5ad4fa1cca188e4dee806 100644
--- a/styles.css
+++ b/styles.css
@@ -4,16 +4,12 @@
margin-left: 20px;
}
-.block_course_overview_campus .hidenewsicon {
- float: left;
-}
-
.block_course_overview_campus a:first-of-type > .icon {
margin-left: inherit; /* Get rid of a unneeded Moodle core behaviour here */
}
-/* Used for hiding courses and news in courselist */
+/* Used for hiding courses in courselist */
.coc-hidden {
display: none;
}
@@ -44,7 +40,7 @@
/* Course list appearance */
#coc-courselist .coursebox h3 {
margin: 0; /* Remove standard margin from h3 heading*/
- padding: 0 0 0 30px; /* Add left padding to place the course news icon there */
+ padding: 0 0 0 .5rem; /* Keep some of the left padding where the course news icon was previously */
}
#coc-courselist .coc-metainfo {
@@ -52,15 +48,3 @@
font-weight: normal; /* To prevent the text from being shown in bold as it's still a h3 heading*/
white-space: pre-wrap; /* To support multiple whitespaces before and after pipe */
}
-
-
-/* Course news appearance */
-#coc-courselist .coc-coursenews {
- border-left: 1px dashed lightgrey;
- margin: 10px 0 0 40px;
- padding: 0 0 0 10px;
-}
-
-#coc-courselist .coursebox .iconlarge {
- float: left;
-}
diff --git a/version.php b/version.php
index 9ff89b70d0963c5628d70838db62cc156510c4f7..b590054b6c3812a9b8a84aee10543edc8fa3f223 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'block_course_overview_campus';
-$plugin->version = 2019032800;
+$plugin->version = 2019061200;
$plugin->release = 'v3.6-r1';
$plugin->requires = 2019052000;
$plugin->maturity = MATURITY_STABLE;