Merge branch 'MDL-83128-405' of https://github.com/paulholden/moodle into MOODLE_405_STABLE
This commit is contained in:
@@ -133,7 +133,7 @@ class block_social_activities extends block_list {
|
||||
}
|
||||
|
||||
if ($ismoving) {
|
||||
$this->content->icons[] = ' ' . $OUTPUT->pix_icon('t/move', get_string('move'));
|
||||
$this->content->icons[] = $OUTPUT->pix_icon('t/move', get_string('move'), 'moodle', ['class' => 'ps-1']);
|
||||
$cancelurl = new moodle_url('/course/mod.php', array('cancelcopy' => 'true', 'sesskey' => sesskey()));
|
||||
$this->content->items[] = $USER->activitycopyname . ' (<a href="' . $cancelurl . '">' . $strcancel . '</a>)';
|
||||
}
|
||||
|
||||
@@ -1531,7 +1531,7 @@ class core_renderer extends renderer_base {
|
||||
foreach ($items as $key => $string) {
|
||||
$item = html_writer::start_tag('li', ['class' => 'r' . $row]);
|
||||
if (!empty($icons[$key])) { // test if the content has an assigned icon
|
||||
$item .= html_writer::tag('div', $icons[$key], ['class' => 'icon column c0']);
|
||||
$item .= html_writer::tag('div', $icons[$key], ['class' => 'column c0 icon-size-3']);
|
||||
}
|
||||
$item .= html_writer::tag('div', $string, ['class' => 'column c1']);
|
||||
$item .= html_writer::end_tag('li');
|
||||
|
||||
Reference in New Issue
Block a user