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

MDL-42613 core_group: removed unnecessary table row when there is no group description or picture

Browse Source
This commit is contained in:
Mark Nelson
2013-10-30 17:59:29 +08:00
parent 67d4599aff
commit 89f71167f1
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
group/members.php
+30 -15
View File
@@ -99,25 +99,40 @@ $PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('adduserstogroup', 'group').": $groupname", 3);
/// Print group info - TODO: remove tables for layout here
$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);
// Store the rows we want to display in the group info.
$groupinforow = array();
$contentcell = new html_table_cell();
$contentcell->attributes['class'] = 'content';
// Check if there is a picture to display.
if (!empty($group->picture)) {
$picturecell = new html_table_cell();
$picturecell->attributes['class'] = 'left side picture';
$picturecell->text = print_group_picture($group, $course->id, true, true, false);
$groupinforow[] = $picturecell;
}
// Check if there is a description to display.
$group->description = file_rewrite_pluginfile_urls($group->description, 'pluginfile.php', $context->id, 'group', 'description', $group->id);
if (!isset($group->descriptionformat)) {
$group->descriptionformat = FORMAT_MOODLE;
if (!empty($group->description)) {
if (!isset($group->descriptionformat)) {
$group->descriptionformat = FORMAT_MOODLE;
}
$options = new stdClass;
$options->overflowdiv = true;
$contentcell = new html_table_cell();
$contentcell->attributes['class'] = 'content';
$contentcell->text = format_text($group->description, $group->descriptionformat, $options);
$groupinforow[] = $contentcell;
}
// Check if we have something to show.
if (!empty($groupinforow)) {
$groupinfotable = new html_table();
$groupinfotable->attributes['class'] = 'groupinfobox';
$groupinfotable->data[] = new html_table_row($groupinforow);
echo html_writer::table($groupinfotable);
}
$options = new stdClass;
$options->overflowdiv = true;
$contentcell->text = format_text($group->description, $group->descriptionformat, $options);
$groupinfotable->data[] = new html_table_row(array($picturecell, $contentcell));
echo html_writer::table($groupinfotable);
/// Print the editing form
?>