From 4d41cec8dba2e2f45b2675823dabf986ace4625f Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 29 Nov 2016 10:07:16 +0800 Subject: [PATCH] MDL-57124 boost: Show pageheaderbutton when no navbar Even if there is no navbar - if there is a pageheaderbutton we need to show it (E.g. Customise this page on dashboard). --- theme/boost/classes/output/core_renderer.php | 5 ++++- theme/boost/scss/moodle/modules.scss | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php index 04dad652a72..fdcc213d13b 100644 --- a/theme/boost/classes/output/core_renderer.php +++ b/theme/boost/classes/output/core_renderer.php @@ -81,11 +81,14 @@ class core_renderer extends \core_renderer { $html .= html_writer::start_div('card-block'); $html .= html_writer::div($this->context_header_settings_menu(), 'pull-xs-right context-header-settings-menu'); $html .= $this->context_header(); + $pageheadingbutton = $this->page_heading_button(); if (empty($PAGE->layout_options['nonavbar'])) { $html .= html_writer::start_div('clearfix', array('id' => 'page-navbar')); $html .= html_writer::tag('div', $this->navbar(), array('class' => 'breadcrumb-nav')); - $html .= html_writer::div($this->page_heading_button(), 'breadcrumb-button'); + $html .= html_writer::div($pageheadingbutton, 'breadcrumb-button'); $html .= html_writer::end_div(); + } else if ($pageheadingbutton) { + $html .= html_writer::div($pageheadingbutton, 'breadcrumb-button nonavbar'); } $html .= html_writer::tag('div', $this->course_header(), array('id' => 'course-header')); $html .= html_writer::end_div(); diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss index 90fe2424319..22b6db0075a 100644 --- a/theme/boost/scss/moodle/modules.scss +++ b/theme/boost/scss/moodle/modules.scss @@ -183,6 +183,9 @@ select { .breadcrumb-button { float: right; margin-top: 4px; + &.nonavbar { + margin-top: -3rem; + } } .breadcrumb-button .singlebutton {