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

MDL-70821 course: Render activity information output component in course

Browse Source 
Includes fixup from Shamim Rezaie <[email protected]>
This commit is contained in:
Jun Pataleta
2021-04-12 12:29:23 +08:00
parent 89cab88a3a
commit 9ec5602f7b
4 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/renderer.php
+12 -4
View File
@@ -828,7 +828,12 @@ class core_course_renderer extends plugin_renderer_base {
public function course_section_cm_list_item($course, &$completioninfo, cm_info $mod, $sectionreturn, $displayoptions = array()) {
$output = '';
if ($modulehtml = $this->course_section_cm($course, $completioninfo, $mod, $sectionreturn, $displayoptions)) {
$modclasses = 'activity ' . $mod->modname . ' modtype_' . $mod->modname . ' ' . $mod->extraclasses;
$infoclass = '';
if (($course->showcompletionconditions == COMPLETION_SHOW_CONDITIONS) || !empty($course->showactivitydates)) {
// This will apply styles to the course homepage when the activity information output component is displayed.
$infoclass = 'hasinfo';
}
$modclasses = 'activity ' . $mod->modname . ' modtype_' . $mod->modname . ' ' . $mod->extraclasses . ' ' . $infoclass;
$output .= html_writer::tag('li', $modulehtml, array('class' => $modclasses, 'id' => 'module-' . $mod->id));
}
return $output;
@@ -844,7 +849,6 @@ class core_course_renderer extends plugin_renderer_base {
* {@link core_course_renderer::course_section_cm_name()}
* {@link core_course_renderer::course_section_cm_text()}
* {@link core_course_renderer::course_section_cm_availability()}
* {@link core_course_renderer::course_section_cm_completion()}
* {@link course_get_cm_edit_actions()}
* {@link core_course_renderer::course_section_cm_edit_actions()}
*
@@ -856,6 +860,8 @@ class core_course_renderer extends plugin_renderer_base {
* @return string
*/
public function course_section_cm($course, &$completioninfo, cm_info $mod, $sectionreturn, $displayoptions = array()) {
global $USER;
$output = '';
// We return empty string (because course module will not be displayed at all)
// if:
@@ -925,12 +931,14 @@ class core_course_renderer extends plugin_renderer_base {
$modicons .= $mod->afterediticons;
}
$modicons .= $this->course_section_cm_completion($course, $completioninfo, $mod, $displayoptions);
if (!empty($modicons)) {
$output .= html_writer::div($modicons, 'actions');
}
$completiondetails = \core_completion\cm_completion_details::get_instance($mod, $USER->id);
$activitydates = \core\activity_dates::get_dates_for_module($mod, $USER->id);
$output .= $this->output->activity_information($mod, $completiondetails, $activitydates);
// Show availability info (if module is not available).
$output .= $this->course_section_cm_availability($mod, $displayoptions);
theme/boost/scss/moodle/course.scss
+11
View File
@@ -207,6 +207,17 @@ body:not(.editing) .sitetopic ul.section {
.section li.activity {
padding: .2em;
clear: both;
&.hasinfo {
border-bottom: $border-width solid $table-border-color;
padding-top: map-get($spacers, 3);
padding-bottom: map-get($spacers, 3);
&:last-child {
border-bottom: 0;
padding-bottom: 0;
}
}
}
.section .activity .activityinstance .groupinglabel {
theme/boost/style/moodle.css
+7
View File
@@ -13377,6 +13377,13 @@ body:not(.editing) .sitetopic ul.section {
.section li.activity {
padding: .2em;
clear: both; }
.section li.activity.hasinfo {
border-bottom: 1px solid #dee2e6;
padding-top: 1rem;
padding-bottom: 1rem; }
.section li.activity.hasinfo:last-child {
border-bottom: 0;
padding-bottom: 0; }
.section .activity .activityinstance .groupinglabel {
padding-left: 30px; }
theme/classic/style/moodle.css
+7
View File
@@ -13591,6 +13591,13 @@ body:not(.editing) .sitetopic ul.section {
.section li.activity {
padding: .2em;
clear: both; }
.section li.activity.hasinfo {
border-bottom: 1px solid #dee2e6;
padding-top: 1rem;
padding-bottom: 1rem; }
.section li.activity.hasinfo:last-child {
border-bottom: 0;
padding-bottom: 0; }
.section .activity .activityinstance .groupinglabel {
padding-left: 30px; }