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

MDL-46984 core_course: added grouping name for activities with no link

Browse Source
This commit is contained in:
Julien Boulen
2014-10-03 13:10:01 -07:00
committed by Mark Nelson
parent d07b0302a9
commit 0556eaa9b0
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/renderer.php
+4 -7
View File
@@ -791,12 +791,7 @@ class core_course_renderer extends plugin_renderer_base {
// has already been encoded for display (puke).
$onclick = htmlspecialchars_decode($mod->onclick, ENT_QUOTES);
$groupinglabel = '';
if (!empty($mod->groupingid) && has_capability('moodle/course:managegroups', context_course::instance($mod->course))) {
$groupings = groups_get_all_groupings($mod->course);
$groupinglabel = html_writer::tag('span', '('.format_string($groupings[$mod->groupingid]->name).')',
array('class' => 'groupinglabel '.$textclasses));
}
$groupinglabel = $mod->get_grouping_label($textclasses);
// Display link itself.
$activitylink = html_writer::empty_tag('img', array('src' => $mod->get_icon_url(),
@@ -853,8 +848,10 @@ class core_course_renderer extends plugin_renderer_base {
trim('contentafterlink ' . $textclasses)));
}
} else {
$groupinglabel = $mod->get_grouping_label($textclasses);
// No link, so display only content.
$output = html_writer::tag('div', $accesstext . $content,
$output = html_writer::tag('div', $accesstext . $content . $groupinglabel,
array('class' => 'contentwithoutlink ' . $textclasses));
}
return $output;