Skip to content
Snippets Groups Projects
Commit c12bea83 authored by Alexander Bias's avatar Alexander Bias
Browse files

Bugfix: Remove overwritten template full_header.mustache

parent 1cb91ef4
Branches
Tags v1.0.1
No related merge requests found
Show whitespace changes
Inline Side-by-side
CHANGES.md
+ 1
− 0
View file @ c12bea83
...@@ -6,6 +6,7 @@ Changes ...@@ -6,6 +6,7 @@ Changes
### Unreleased ### Unreleased
* 2021-08-16 - Bugfix: Remove overwritten template full_header.mustache. If the setting showsettingsincourse is enabled, this will place the cog icon _over_ instead of _near_ the edit button. This will fix a presentation issue with the in-course settings menu on smaller screens.
* 2021-08-16 - Improvement: Re-add the margin below the breadcrumb as this does not need to differ between theme_boost and theme_boost_campus anymore * 2021-08-16 - Improvement: Re-add the margin below the breadcrumb as this does not need to differ between theme_boost and theme_boost_campus anymore
### v3.10-r6 ### v3.10-r6
......
classes/output/core_renderer.php
+ 1
− 6
View file @ c12bea83
...@@ -193,12 +193,7 @@ class core_renderer extends \core_renderer { ...@@ -193,12 +193,7 @@ class core_renderer extends \core_renderer {
$header->headeractions = $this->page->get_header_actions(); $header->headeractions = $this->page->get_header_actions();
// MODIFICATION START: // MODIFICATION START:
// Change this to add the result in the html variable to be able to add further features below the header. // Change this to add the result in the html variable to be able to add further features below the header.
// Render from the own header template if we are not on the content bank view page (contentbank/view.php).
if ($this->page->bodyid == 'page-contentbank') {
$html = $this->render_from_template('core/full_header', $header); $html = $this->render_from_template('core/full_header', $header);
} else {
$html = $this->render_from_template('theme_boost_campus/full_header', $header);
}
// MODIFICATION END. // MODIFICATION END.
// @codingStandardsIgnoreStart // @codingStandardsIgnoreStart
/* ORIGINAL START /* ORIGINAL START
......
templates/full_header.mustache deleted 100644 → 0
+ 0
− 67
View file @ 1cb91ef4
{{!
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 <http://www.gnu.org/licenses/>.
}}
{{!
@template theme_boost_campus/full_header
This template renders the header.
Example context (json):
{
"contextheader": "context_header_html",
"settingsmenu": "settings_html",
"hasnavbar": false,
"navbar": "navbar_if_available",
"courseheader": "course_header_html"
}
}}
{{! MODIFICATION:
* Changed the order of the settingsmenu item.
}}
<header id="page-header" class="row">
<div class="col-12 pt-3 pb-3">
<div class="card {{^contextheader}}border-0 bg-transparent{{/contextheader}}">
<div class="card-body {{^contextheader}}p-2{{/contextheader}}">
<div class="d-flex">
{{#contextheader}}
<div class="mr-auto">
{{{contextheader}}}
</div>
{{/contextheader}}
</div>
<div class="d-flex flex-wrap">
{{#hasnavbar}}
<div id="page-navbar">
{{{navbar}}}
</div>
{{/hasnavbar}}
<div class="ml-auto d-flex">
{{{pageheadingbutton}}}
</div>
{{#settingsmenu}}
<div class="context-header-settings-menu ml-4">
{{{settingsmenu}}}
</div>
{{/settingsmenu}}
<div id="course-header">
{{{courseheader}}}
</div>
</div>
</div>
</div>
</div>
</header>
templates/full_header.mustache.original deleted 100644 → 0
+ 0
− 66
View file @ 1cb91ef4
{{!
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 <http://www.gnu.org/licenses/>.
}}
{{!
@template boost/header
This template renders the header.
Example context (json):
{
"contextheader": "context_header_html",
"settingsmenu": "settings_html",
"hasnavbar": false,
"navbar": "navbar_if_available",
"courseheader": "course_header_html"
}
Page header.
}}
<header id="page-header" class="row">
<div class="col-12 pt-3 pb-3">
<div class="card {{^contextheader}}border-0 bg-transparent{{/contextheader}}">
<div class="card-body {{^contextheader}}p-2{{/contextheader}}">
<div class="d-flex">
{{#contextheader}}
<div class="mr-auto">
{{{contextheader}}}
</div>
{{/contextheader}}
{{#settingsmenu}}
<div class="context-header-settings-menu">
{{{settingsmenu}}}
</div>
{{/settingsmenu}}
</div>
<div class="d-flex flex-wrap">
{{#hasnavbar}}
<div id="page-navbar">
{{{navbar}}}
</div>
{{/hasnavbar}}
<div class="ml-auto d-flex">
{{{pageheadingbutton}}}
</div>
<div id="course-header">
{{{courseheader}}}
</div>
</div>
</div>
</div>
</div>
</header>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment