Merge branch 'MDL-72470-master' of https://github.com/sharidas/moodle

moodle · Nov 18, 2021 · 1bdb9ca · 1bdb9ca
2 parents dc0e7a4 + 81b0d05
commit 1bdb9ca
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/calendar/export.php b/calendar/export.php
@@ -123,11 +123,13 @@
 $pagetitle = get_string('export', 'calendar');
 
 $PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $managesubscriptionsurl);
-$PAGE->navbar->add($pagetitle);
+$PAGE->navbar->add(get_string('exportcalendar', 'calendar'), $url);
 
 // Print title and header.
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($courseid != SITEID && !empty($courseid)) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $PAGE->set_title($course->shortname.': '.get_string('calendar', 'calendar').': '.$pagetitle);
-$PAGE->set_heading($course->fullname);
+$PAGE->set_heading($headingstr);
 $PAGE->set_pagelayout('standard');
 
 $renderer = $PAGE->get_renderer('core_calendar');

diff --git a/calendar/import.php b/calendar/import.php
@@ -98,14 +98,15 @@
 }
 
 $heading = get_string('importcalendar', 'calendar');
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($courseid != SITEID && !empty($courseid)) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $pagetitle = $course->shortname . ': ' . get_string('calendar', 'calendar') . ': ' . $heading;
 
 $PAGE->set_title($pagetitle);
-$PAGE->set_heading($heading);
+$PAGE->set_heading($headingstr);
 $PAGE->set_url($pageurl);
 $PAGE->set_pagelayout('admin');
-$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $managesubscriptionsurl);
-$PAGE->navbar->add($heading);
+$PAGE->navbar->add($heading, $pageurl);
 $renderer = $PAGE->get_renderer('core_calendar');
 
 $customdata = [

diff --git a/calendar/managesubscriptions.php b/calendar/managesubscriptions.php
@@ -67,8 +67,7 @@
 if (!calendar_user_can_add_event($course)) {
     print_error('errorcannotimport', 'calendar');
 }
-
-$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));
+$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $PAGE->url);
 
 $types = calendar_get_allowed_event_types($courseid);
 
@@ -140,7 +139,9 @@
 
 // Print title and header.
 $PAGE->set_title("$course->shortname: ".get_string('calendar', 'calendar').": ".get_string('subscriptions', 'calendar'));
-$PAGE->set_heading($course->fullname);
+$heading = get_string('calendar', 'core_calendar');
+$heading = ($courseid != SITEID && !empty($courseid)) ? "{$heading}: {$COURSE->shortname}" : $heading;
+$PAGE->set_heading($heading);
 
 $renderer = $PAGE->get_renderer('core_calendar');
 

diff --git a/calendar/view.php b/calendar/view.php
@@ -138,8 +138,8 @@
 $PAGE->set_pagelayout('standard');
 $PAGE->set_title("$course->shortname: $strcalendar: $pagetitle");
 
-$headingstr = ($iscoursecalendar) ? get_string('coursecalendar', 'core_calendar', $COURSE->shortname) :
-        get_string('calendar', 'core_calendar');
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($iscoursecalendar) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $PAGE->set_heading($headingstr);
 
 $renderer = $PAGE->get_renderer('core_calendar');