diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 5c0d9a85c18..b88cc9e86f9 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -4756,6 +4756,8 @@ class assign { // 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 index d898d1905da..0af9308dcdd 100644 --- a/mod/book/tool/print/index.php +++ b/mod/book/tool/print/index.php @@ -54,6 +54,7 @@ if ($chapterid) { $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 @@ if ($chapter) { echo $renderer->render($page); // Finish page output. -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php index 248f8b51eb6..eee084a8010 100644 --- a/mod/chat/gui_ajax/index.php +++ b/mod/chat/gui_ajax/index.php @@ -84,6 +84,7 @@ $PAGE->requires->js_init_call('M.mod_chat_ajax.init', array($modulecfg), false, $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 index c5ea1697ee4..16b9e229185 100644 --- 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 index 762d7f3277c..f3ddd7fd3b5 100644 --- a/theme/boost/layout/embedded.php +++ b/theme/boost/layout/embedded.php @@ -26,9 +26,11 @@ defined('MOODLE_INTERNAL') || die(); $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 index a9a419f03e9..ab390c5a0a0 100644 --- a/theme/boost/templates/embedded.mustache +++ b/theme/boost/templates/embedded.mustache @@ -61,6 +61,9 @@ {{/hasfakeblocks}}
+ {{#headercontent}} + {{> core/activity_header }} + {{/headercontent}} {{{ output.main_content }}}