mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70172-master' of git://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Víctor Déniz 2021-03-02 09:16:41 +00:00
commit b1bbfbbbdb
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
course/lib.php
View File

@ -2016,10 +2016,17 @@ function course_get_cm_move(cm_info $mod, $sr = null) {
$pixicon = 't/move';
}
$attributes = [
'class' => 'editing_move',
'data-action' => 'move',
'data-sectionreturn' => $sr,
'title' => $str->move,
'aria-label' => $str->move,
];
return html_writer::link(
new moodle_url($baseurl, array('copy' => $mod->id)),
$OUTPUT->pix_icon($pixicon, $str->move, 'moodle', array('class' => 'iconsmall', 'title' => '')),
array('class' => 'editing_move', 'data-action' => 'move', 'data-sectionreturn' => $sr)
new moodle_url($baseurl, ['copy' => $mod->id]),
$OUTPUT->pix_icon($pixicon, '', 'moodle', ['class' => 'iconsmall']),
$attributes
);
}
return '';

3
course/renderer.php
View File

@ -2294,7 +2294,8 @@ class core_course_renderer extends plugin_renderer_base {
if ($editing && has_capability('moodle/course:update', $context)) {
$streditsummary = get_string('editsummary');
$editsectionurl = new moodle_url('/course/editsection.php', ['id' => $section->id]);
$output .= html_writer::link($editsectionurl, $this->pix_icon('t/edit', $streditsummary)) .
$attributes = ['title' => $streditsummary, 'aria-label' => $streditsummary];
$output .= html_writer::link($editsectionurl, $this->pix_icon('t/edit', ''), $attributes) .
"<br /><br />";
}

1
lang/en/moodle.php
View File

@ -1188,6 +1188,7 @@ $string['loginstepsnone'] = '<p>Hi!</p>
<p>If someone else has already chosen your username then you\'ll have to try again using a different username.</p>';
$string['loginto'] = 'Log in to {$a}';
$string['loginagain'] = 'Log in again';
$string['logoof'] = 'Logo of {$a}';
$string['logout'] = 'Log out';
$string['logoutconfirm'] = 'Do you really want to log out?';
$string['logs'] = 'Logs';

26
lib/outputrenderers.php
View File

@ -4133,12 +4133,6 @@ EOD;
$subheader = null;
$userbuttons = null;
if ($this->should_display_main_logo($headinglevel)) {
$sitename = format_string($SITE->fullname, true, array('context' => context_course::instance(SITEID)));
return html_writer::div(html_writer::empty_tag('img', [
'src' => $this->get_logo_url(null, 150), 'alt' => $sitename, 'class' => 'img-fluid']), 'logo');
}
// Make sure to use the heading if it has been set.
if (isset($headerinfo['heading'])) {
$heading = $headerinfo['heading'];
@ -4214,6 +4208,26 @@ EOD;
}
}
if ($this->should_display_main_logo($headinglevel)) {
$sitename = format_string($SITE->fullname, true, ['context' => context_course::instance(SITEID)]);
// Logo.
$html = html_writer::div(
html_writer::empty_tag('img', [
'src' => $this->get_logo_url(null, 150),
'alt' => get_string('logoof', '', $sitename),
'class' => 'img-fluid'
]),
'logo'
);
// Heading.
if (!isset($heading)) {
$html .= $this->heading($this->page->heading, $headinglevel, 'sr-only');
} else {
$html .= $this->heading($heading, $headinglevel, 'sr-only');
}
return $html;
}
$contextheader = new context_header($heading, $headinglevel, $imagedata, $userbuttons);
return $this->render_context_header($contextheader);
}