mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-07-05 02:35:26 +02:00
commit 39f8a9636e
1 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
user/index.php
View File

@ -258,39 +258,6 @@ if (!isset($hiddenfields['lastaccess'])) {
echo html_writer::table($controlstable); echo html_writer::table($controlstable);
if ($currentgroup and (!$isseparategroups or has_capability('moodle/site:accessallgroups', $context))) {
// Display info about the group.
if ($group = groups_get_group($currentgroup)) {
if (!empty($group->description) or (!empty($group->picture) and empty($group->hidepicture))) {
$groupinfotable = new html_table();
$groupinfotable->attributes['class'] = 'groupinfobox';
$picturecell = new html_table_cell();
$picturecell->attributes['class'] = 'left side picture';
$picturecell->text = print_group_picture($group, $course->id, true, true, false);
$contentcell = new html_table_cell();
$contentcell->attributes['class'] = 'content';
$contentheading = $group->name;
if (has_capability('moodle/course:managegroups', $context)) {
$aurl = new moodle_url('/group/group.php', array('id' => $group->id, 'courseid' => $group->courseid));
$contentheading .= ' ' . $OUTPUT->action_icon($aurl, new pix_icon('t/edit', get_string('editgroupprofile')));
}
$group->description = file_rewrite_pluginfile_urls($group->description, 'pluginfile.php', $context->id, 'group',
'description', $group->id);
if (!isset($group->descriptionformat)) {
$group->descriptionformat = FORMAT_MOODLE;
}
$options = array('overflowdiv' => true);
$formatteddesc = format_text($group->description, $group->descriptionformat, $options);
$contentcell->text = $OUTPUT->heading($contentheading, 3) . $formatteddesc;
$groupinfotable->data[] = new html_table_row(array($picturecell, $contentcell));
echo html_writer::table($groupinfotable);
}
}
}
// Define a table showing a list of users in the current role selection. // Define a table showing a list of users in the current role selection.
$tablecolumns = array(); $tablecolumns = array();
$tableheaders = array(); $tableheaders = array();
@ -473,9 +440,11 @@ if ($roleid > 0) {
$a->role = $rolenames[$roleid]; $a->role = $rolenames[$roleid];
$heading = format_string(get_string('xuserswiththerole', 'role', $a)); $heading = format_string(get_string('xuserswiththerole', 'role', $a));
if ($currentgroup and !empty($group)) { if ($currentgroup) {
$a->group = $group->name; if ($group = groups_get_group($currentgroup)) {
$heading .= ' ' . format_string(get_string('ingroup', 'role', $a)); $a->group = $group->name;
$heading .= ' ' . format_string(get_string('ingroup', 'role', $a));
}
} }
if ($accesssince && !empty($timeoptions[$accesssince])) { if ($accesssince && !empty($timeoptions[$accesssince])) {