MDL-51013 themes: Suppress navbar button when custom menu is empty
This commit is contained in:
Kevin Wiliarty
committed by
David Monllao
David Monllao
parent
0df465d10a
commit
77241abbad
@@ -41,11 +41,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -50,11 +50,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -55,11 +55,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -51,11 +51,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
<ul class="nav pull-right">
|
||||
|
||||
@@ -54,11 +54,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<span class="brand"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></span>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav pull-right">
|
||||
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
|
||||
|
||||
@@ -91,21 +91,14 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
|
||||
protected function render_custom_menu(custom_menu $menu) {
|
||||
global $CFG;
|
||||
|
||||
// TODO: eliminate this duplicated logic, it belongs in core, not
|
||||
// here. See MDL-39565.
|
||||
$addlangmenu = true;
|
||||
$langs = get_string_manager()->get_list_of_translations();
|
||||
if (count($langs) < 2
|
||||
or empty($CFG->langmenu)
|
||||
or ($this->page->course != SITEID and !empty($this->page->course->lang))) {
|
||||
$addlangmenu = false;
|
||||
}
|
||||
$haslangmenu = $this->lang_menu() != '';
|
||||
|
||||
if (!$menu->has_children() && $addlangmenu === false) {
|
||||
if (!$menu->has_children() && !$haslangmenu) {
|
||||
return '';
|
||||
}
|
||||
|
||||
if ($addlangmenu) {
|
||||
if ($haslangmenu) {
|
||||
$strlang = get_string('language');
|
||||
$currentlang = current_language();
|
||||
if (isset($langs[$currentlang])) {
|
||||
@@ -185,6 +178,30 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* This code renders the navbar button to control the display of the custom menu
|
||||
* on smaller screens.
|
||||
*
|
||||
* Do not display the button if the menu is empty.
|
||||
*
|
||||
* @return string HTML fragment
|
||||
*/
|
||||
protected function navbar_button() {
|
||||
global $CFG;
|
||||
|
||||
if (empty($CFG->custommenuitems) && $this->lang_menu() == '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$iconbar = html_writer::tag('span', '', array('class' => 'icon-bar'));
|
||||
$button = html_writer::tag('a', $iconbar . "\n" . $iconbar. "\n" . $iconbar, array(
|
||||
'class' => 'btn btn-navbar',
|
||||
'data-toggle' => 'collapse',
|
||||
'data-target' => '.nav-collapse'
|
||||
));
|
||||
return $button;
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders tabtree
|
||||
*
|
||||
|
||||
@@ -44,11 +44,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -53,11 +53,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -63,11 +63,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></a>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<?php echo $OUTPUT->user_menu(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<?php echo $OUTPUT->custom_menu(); ?>
|
||||
|
||||
@@ -57,11 +57,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<span class="brand"><?php echo
|
||||
format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
?></span>
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<?php echo $OUTPUT->navbar_button(); ?>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav pull-right">
|
||||
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
|
||||
|
||||
Reference in New Issue
Block a user