mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
MDL-21119 lang menu and login info now handled by themes
This commit is contained in:
parent
684b988c94
commit
244a32c617
26 changed files with 155 additions and 187 deletions
|
@ -66,6 +66,7 @@ $THEME->layouts = array(
|
|||
'file' => 'general.php',
|
||||
'regions' => array('side-pre', 'side-post'),
|
||||
'defaultregion' => 'side-post',
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
'coursecategory' => array(
|
||||
'theme' => 'base',
|
||||
|
@ -100,6 +101,7 @@ $THEME->layouts = array(
|
|||
'file' => 'general.php',
|
||||
'regions' => array('side-pre', 'side-post'),
|
||||
'defaultregion' => 'side-post',
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
// My public page
|
||||
'mypublic' => array(
|
||||
|
@ -112,6 +114,7 @@ $THEME->layouts = array(
|
|||
'theme' => 'base',
|
||||
'file' => 'general.php',
|
||||
'regions' => array(),
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
|
||||
// Pages that appear in pop-up windows - no navigation, no blocks, no header.
|
||||
|
|
|
@ -24,11 +24,9 @@ echo $OUTPUT->doctype() ?>
|
|||
<div id="header-home" class="clearfix">
|
||||
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
|
||||
<div class="headermenu"><?php
|
||||
if ($PAGE->headingmenu) {
|
||||
echo $PAGE->headingmenu;
|
||||
} else {
|
||||
echo $OUTPUT->login_info();
|
||||
}
|
||||
echo $OUTPUT->lang_menu();
|
||||
echo $PAGE->headingmenu;
|
||||
?></div>
|
||||
</div>
|
||||
<!-- END OF HEADER -->
|
||||
|
|
|
@ -23,7 +23,13 @@ echo $OUTPUT->doctype() ?>
|
|||
<?php if ($PAGE->heading) { ?>
|
||||
<div id="header" class="clearfix">
|
||||
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
|
||||
<div class="headermenu"><?php echo $PAGE->headingmenu ?></div>
|
||||
<div class="headermenu"><?php
|
||||
echo $OUTPUT->login_info();
|
||||
if (!empty($PAGE->layout_options['langmenu'])) {
|
||||
echo $OUTPUT->lang_menu();
|
||||
}
|
||||
echo $PAGE->headingmenu
|
||||
?></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
|
|
@ -97,6 +97,7 @@ $THEME->layouts = array(
|
|||
'file' => 'normal.php',
|
||||
'regions' => array('side-pre', 'side-post'),
|
||||
'defaultregion' => 'side-post',
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
'coursecategory' => array(
|
||||
'theme' => 'base',
|
||||
|
@ -131,6 +132,7 @@ $THEME->layouts = array(
|
|||
'file' => 'normal.php',
|
||||
'regions' => array('side-pre', 'side-post'),
|
||||
'defaultregion' => 'side-post',
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
// My public page
|
||||
'mypublic' => array(
|
||||
|
@ -143,6 +145,7 @@ $THEME->layouts = array(
|
|||
'theme' => 'standard',
|
||||
'file' => 'normal.php',
|
||||
'regions' => array(),
|
||||
'options' => array('langmenu'=>true),
|
||||
),
|
||||
|
||||
// Pages that appear in pop-up windows - no navigation, no blocks, no header.
|
||||
|
|
|
@ -13,7 +13,13 @@
|
|||
<?php if ($PAGE->heading) { ?>
|
||||
<div id="header" class="clearfix">
|
||||
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
|
||||
<div class="headermenu"><?php echo $PAGE->headingmenu ?></div>
|
||||
<div class="headermenu"><?php
|
||||
echo $OUTPUT->login_info();
|
||||
if (!empty($PAGE->layout_options['langmenu'])) {
|
||||
echo $OUTPUT->lang_menu();
|
||||
}
|
||||
echo $PAGE->headingmenu
|
||||
?></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
|
|
@ -14,10 +14,9 @@
|
|||
<div id="header-home" class="clearfix">
|
||||
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
|
||||
<div class="headermenu"><?php
|
||||
echo $OUTPUT->login_info();
|
||||
if ($PAGE->headingmenu) {
|
||||
echo $OUTPUT->login_info();
|
||||
echo $OUTPUT->lang_menu();
|
||||
echo $PAGE->headingmenu;
|
||||
}
|
||||
?></div>
|
||||
</div>
|
||||
<hr />
|
||||
|
|
|
@ -13,7 +13,13 @@
|
|||
<?php if ($PAGE->heading) { ?>
|
||||
<div id="header" class="clearfix">
|
||||
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
|
||||
<div class="headermenu"><?php echo $PAGE->headingmenu ?></div>
|
||||
<div class="headermenu"><?php
|
||||
echo $OUTPUT->login_info();
|
||||
if (!empty($PAGE->layout_options['langmenu'])) {
|
||||
echo $OUTPUT->lang_menu();
|
||||
}
|
||||
echo $PAGE->headingmenu
|
||||
?></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue