diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php index b4828c64505..f715c4eedaf 100644 --- a/theme/boost/classes/output/core_renderer.php +++ b/theme/boost/classes/output/core_renderer.php @@ -694,4 +694,12 @@ class core_renderer extends \core_renderer { return $skipped; } + /** + * Secure login info. + * + * @return string + */ + public function secure_login_info() { + return $this->login_info(false); + } } diff --git a/theme/boost/layout/secure.php b/theme/boost/layout/secure.php index b0ae36aad9a..4765c2c3f13 100644 --- a/theme/boost/layout/secure.php +++ b/theme/boost/layout/secure.php @@ -24,10 +24,16 @@ defined('MOODLE_INTERNAL') || die(); +$blockshtml = $OUTPUT->blocks('side-pre'); +$hasblocks = strpos($blockshtml, 'data-block=') !== false; +$bodyattributes = $OUTPUT->body_attributes(); + $templatecontext = [ 'sitename' => format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID))), 'output' => $OUTPUT, - 'sidepreblocks' => $OUTPUT->blocks('side-pre'), + 'bodyattributes' => $bodyattributes, + 'sidepreblocks' => $blockshtml, + 'hasblocks' => $hasblocks ]; echo $OUTPUT->render_from_template('theme_boost/secure', $templatecontext); diff --git a/theme/boost/templates/header-secure.mustache b/theme/boost/templates/header-secure.mustache new file mode 100644 index 00000000000..852107baba8 --- /dev/null +++ b/theme/boost/templates/header-secure.mustache @@ -0,0 +1,43 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see . +}} +{{! + Page header. +}} + + diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache index b75d798233a..8513a966240 100644 --- a/theme/boost/templates/secure.mustache +++ b/theme/boost/templates/secure.mustache @@ -43,56 +43,53 @@ - + -{{{ output.standard_top_of_body_html }}} +
-
-
-
- -
+ {{{ output.standard_top_of_body_html }}} - - {{# output.should_display_navbar_logo }} -
-
- {{{ output.full_header }}} - -
-
-
-
+
+
+
+
+ {{{ output.course_content_header }}} {{{ output.main_content }}} + {{{ output.course_content_footer }}} +
+ {{#hasblocks}} +
+ {{{ sidepreblocks }}} +
+ {{/hasblocks}}
- - {{{ output.standard_end_of_body_html }}} -
+ + {{#js}}