L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-63794 block_myoverview: Display the course category name in block

Browse Source
This commit is contained in:
Mihail Geshoski
2018-12-17 13:21:55 +08:00
parent d657d80db0
commit 6c52667722
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/myoverview/templates/view-cards.mustache
+11 -1
View File
@@ -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}}
</span>
{{/coursename}}
{{$coursecategory}}
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
<div>{{{coursecategory}}}</div>
{{/coursecategory}}
{{$divider}}
<div class="pl-1 pr-1">|</div>
{{/divider}}
{{/ core_course/coursecards }}
blocks/myoverview/templates/view-list.mustache
+12 -6
View File
@@ -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 @@
<div class="row-fluid">
<div class="{{#hasprogress}}col-md-6 span6{{/hasprogress}}{{^hasprogress}}col-md-11 span11{{/hasprogress}} d-flex align-items-center">
<a href="{{viewurl}}" class="coursename">
{{#showshortname}}
<div class="text-muted muted d-flex" style="flex-flow:wrap;">
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
<div>{{{coursecategory}}}</div>
{{#showshortname}}
<div class="pl-1 pr-1">|</div>
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
<div class="text-muted muted">
{{{shortname}}}
</div>
{{/showshortname}}
<div>{{{shortname}}}</div>
{{/showshortname}}
</div>
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
blocks/myoverview/templates/view-summary.mustache
+13 -7
View File
@@ -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 @@
<div class="align-self-stretch d-flex flex-column w-100">
<div class="d-flex mb-1">
<a href="{{viewurl}}" class="coursename">
{{#showshortname}}
<div class="text-muted muted mb-1 d-flex" style="flex-flow:wrap;">
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
<div>{{{coursecategory}}}</div>
{{#showshortname}}
<div class="pl-1 pr-1">|</div>
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
<div class="text-muted muted mb-1">
{{{shortname}}}
</div>
{{/showshortname}}
<div>{{{shortname}}}</div>
{{/showshortname}}
</div>
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
</span>
<h6 class="d-inline h5">{{{fullname}}}</h4>
<h6 class="d-inline h5">{{{fullname}}}</h6>
</a>
{{> block_myoverview/course-action-menu }}
</div>
course/classes/external/course_summary_exporter.php
Vendored
+6 -1
View File
@@ -65,6 +65,7 @@ class course_summary_exporter extends \core\external\exporter {
$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 @@ class course_summary_exporter extends \core\external\exporter {
'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 @@ class course_summary_exporter extends \core\external\exporter {
),
'showshortname' => array(
'type' => PARAM_BOOL
),
'coursecategory' => array(
'type' => PARAM_TEXT
)
);
}
course/templates/coursecards.mustache
+13 -8
View File
@@ -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 @@
<div class="card-body pr-1 course-info-container" id="course-info-container-{{id}}-{{uniqid}}">
<div class="d-flex align-items-start">
<a href="{{viewurl}}" class="coursename mr-2 text-truncate">
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
{{#showshortname}}
<div class="text-muted muted w-100 mb-1 text-truncate">
{{{shortname}}}
<div class="text-muted muted d-flex w-100 mb-1 text-truncate" style="flex-flow:wrap;">
{{$coursecategory}}{{/coursecategory}}
{{#showshortname}}
{{$divider}}{{/divider}}
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
<div>
{{{shortname}}}
</div>
{{/showshortname}}
</div>
{{/showshortname}}
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
lang/en/course.php
+1
View File
@@ -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';