Merge branch 'MDL-74602-master' of https://github.com/snake/moodle

gjb2048 · May 5, 2022 · 93e96e0 · 93e96e0
2 parents 96ffb21 + db93333
commit 93e96e0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -4756,6 +4756,8 @@ protected function view_grader() {
         // Need submit permission to submit an assignment.
         $this->require_view_grades();
 
+        $PAGE->activityheader->disable();
+
         $PAGE->set_pagelayout('embedded');
 
         $courseshortname = $this->get_context()->get_course_context()->get_context_name(false, true);

diff --git a/mod/book/tool/print/index.php b/mod/book/tool/print/index.php
@@ -54,6 +54,7 @@
 
 $PAGE->set_url('/mod/book/print.php', array('id' => $id, 'chapterid' => $chapterid));
 
+$PAGE->activityheader->disable();
 $PAGE->set_pagelayout("embedded");
 
 unset($id);
@@ -93,4 +94,4 @@
 echo $renderer->render($page);
 
 // Finish page output.
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
@@ -84,6 +84,7 @@
 
 $PAGE->set_title(get_string('modulename', 'chat').": $courseshortname: ".format_string($chat->name, true)."$groupname");
 $PAGE->add_body_class('yui-skin-sam');
+$PAGE->activityheader->disable();
 $PAGE->set_pagelayout('embedded');
 if ( $theme != 'course_theme') {
     $PAGE->requires->css('/mod/chat/gui_ajax/theme/'.$theme.'/chat.css');

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
@@ -2261,6 +2261,7 @@ class page_wiki_prettyview extends page_wiki {
     function __construct($wiki, $subwiki, $cm) {
         global $PAGE;
         $PAGE->set_pagelayout('embedded');
+        $PAGE->activityheader->disable();
         parent::__construct($wiki, $subwiki, $cm);
     }
 

diff --git a/theme/boost/layout/embedded.php b/theme/boost/layout/embedded.php
@@ -26,9 +26,11 @@
 
 $fakeblockshtml = $OUTPUT->blocks('side-pre', array(), 'aside', true);
 $hasfakeblocks = strpos($fakeblockshtml, 'data-block="_fake"') !== false;
+$renderer = $PAGE->get_renderer('core');
 
 $templatecontext = [
     'output' => $OUTPUT,
+    'headercontent' => $PAGE->activityheader->export_for_template($renderer),
     'hasfakeblocks' => $hasfakeblocks,
     'fakeblocks' => $fakeblockshtml,
 ];

diff --git a/theme/boost/templates/embedded.mustache b/theme/boost/templates/embedded.mustache
@@ -61,6 +61,9 @@
         </section>
     {{/hasfakeblocks}}
     <section class="embedded-main">
+        {{#headercontent}}
+            {{> core/activity_header }}
+        {{/headercontent}}
         {{{ output.main_content }}}
     </section>
 </div>