diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache index f74554a1cd596..ff2e63c93533f 100644 --- a/blocks/myoverview/templates/view-cards.mustache +++ b/blocks/myoverview/templates/view-cards.mustache @@ -28,7 +28,8 @@ "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg", "fullname": "course 3", "hasprogress": true, - "progress": 10 + "progress": 10, + "coursecategory": "Miscellaneous" } ] } @@ -50,4 +51,13 @@ {{#shortentext}}50, {{{fullname}}} {{/shortentext}} {{/coursename}} + {{$coursecategory}} + + {{#str}}aria:coursecategory, core_course{{/str}} + +
{{{coursecategory}}}
+ {{/coursecategory}} + {{$divider}} +
|
+ {{/divider}} {{/ core_course/coursecards }} diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache index 0deb0b3b3875b..a39a9bbbad808 100644 --- a/blocks/myoverview/templates/view-list.mustache +++ b/blocks/myoverview/templates/view-list.mustache @@ -28,7 +28,8 @@ "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg", "fullname": "course 3", "hasprogress": true, - "progress": 10 + "progress": 10, + "coursecategory": "Miscellaneous" } ] } @@ -42,14 +43,19 @@
- {{#showshortname}} +
+ + {{#str}}aria:coursecategory, core_course{{/str}} + +
{{{coursecategory}}}
+ {{#showshortname}} +
|
{{#str}}aria:courseshortname, core_course{{/str}} -
- {{{shortname}}} -
- {{/showshortname}} +
{{{shortname}}}
+ {{/showshortname}} +
{{> core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache index 1c95a2d6dc0f5..876a7ecb4076d 100644 --- a/blocks/myoverview/templates/view-summary.mustache +++ b/blocks/myoverview/templates/view-summary.mustache @@ -29,7 +29,8 @@ "fullname": "course 3", "summary": "This course is about assignments", "hasprogress": true, - "progress": 10 + "progress": 10, + "coursecategory": "Miscellaneous" } ] } @@ -49,19 +50,24 @@
- {{#showshortname}} +
+ + {{#str}}aria:coursecategory, core_course{{/str}} + +
{{{coursecategory}}}
+ {{#showshortname}} +
|
{{#str}}aria:courseshortname, core_course{{/str}} -
- {{{shortname}}} -
- {{/showshortname}} +
{{{shortname}}}
+ {{/showshortname}} +
{{> core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} -
{{{fullname}}}
+
{{{fullname}}}
 {{> block_myoverview/course-action-menu }}
diff --git a/course/classes/external/course_summary_exporter.php b/course/classes/external/course_summary_exporter.php index bef5cad89c0d6..a4485ee9b0ffd 100644 --- a/course/classes/external/course_summary_exporter.php +++ b/course/classes/external/course_summary_exporter.php @@ -65,6 +65,7 @@ protected function get_other_values(renderer_base $output) { $hasprogress = true; } $progress = floor($progress); + $coursecategory = \core_course_category::get($this->data->category, MUST_EXIST, true); return array( 'fullnamedisplay' => get_course_display_name_for_list($this->data), 'viewurl' => (new moodle_url('/course/view.php', array('id' => $this->data->id)))->out(false), @@ -73,7 +74,8 @@ protected function get_other_values(renderer_base $output) { 'hasprogress' => $hasprogress, 'isfavourite' => $this->related['isfavourite'], 'hidden' => boolval(get_user_preferences('block_myoverview_hidden_course_' . $this->data->id, 0)), - 'showshortname' => $CFG->courselistshortnames ? true : false + 'showshortname' => $CFG->courselistshortnames ? true : false, + 'coursecategory' => $coursecategory->name ); } @@ -149,6 +151,9 @@ public static function define_other_properties() { ), 'showshortname' => array( 'type' => PARAM_BOOL + ), + 'coursecategory' => array( + 'type' => PARAM_TEXT ) ); } diff --git a/course/templates/coursecards.mustache b/course/templates/coursecards.mustache index 00cb8923e08df..c2c09a0bf82af 100644 --- a/course/templates/coursecards.mustache +++ b/course/templates/coursecards.mustache @@ -28,7 +28,8 @@ "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg", "fullname": "course 3", "hasprogress": true, - "progress": 10 + "progress": 10, + "coursecategory": "Miscellaneous" } ] } @@ -47,14 +48,18 @@
- - {{#str}}aria:courseshortname, core_course{{/str}} - - {{#showshortname}} -
- {{{shortname}}} +
+ {{$coursecategory}}{{/coursecategory}} + {{#showshortname}} + {{$divider}}{{/divider}} + + {{#str}}aria:courseshortname, core_course{{/str}} + +
+ {{{shortname}}} +
+ {{/showshortname}}
- {{/showshortname}} {{> core_course/favouriteicon }} {{#str}}aria:coursename, core_course{{/str}} diff --git a/lang/en/course.php b/lang/en/course.php index 84b17bef17cfa..f5747793c4fd9 100644 --- a/lang/en/course.php +++ b/lang/en/course.php @@ -22,6 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +$string['aria:coursecategory'] = 'Course category'; $string['aria:courseimage'] = 'Course image'; $string['aria:courseshortname'] = 'Course short name'; $string['aria:coursename'] = 'Course name';