Commit 118530e6 authored by Sam Hemelryk's avatar Sam Hemelryk
Browse files

Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/canvas/config.php
parents 0f78d5c0 4543168e
...@@ -187,7 +187,7 @@ $THEME->hidefromselector = true; ...@@ -187,7 +187,7 @@ $THEME->hidefromselector = true;
// switched on. // switched on.
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
// $THEME->enable_dock = false; $THEME->enable_dock = true;
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Do you want to use the new navigation dock? // Do you want to use the new navigation dock?
......
<?php <?php
$hasheading = ($PAGE->heading);
$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter']));
$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); $hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
$showsidepre = $hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT);
$showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT);
$custommenu = $OUTPUT->custom_menu();
$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
$bodyclasses = array(); $bodyclasses = array();
if ($hassidepre && !$hassidepost) { if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'side-pre-only'; $bodyclasses[] = 'side-pre-only';
} else if ($hassidepost && !$hassidepre) { } else if ($showsidepost && !$showsidepre) {
$bodyclasses[] = 'side-post-only'; $bodyclasses[] = 'side-post-only';
} else if (!$hassidepost && !$hassidepre) { } else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only'; $bodyclasses[] = 'content-only';
} }
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
echo $OUTPUT->doctype() ?> echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>> <html <?php echo $OUTPUT->htmlattributes() ?>>
...@@ -30,20 +35,24 @@ echo $OUTPUT->doctype() ?> ...@@ -30,20 +35,24 @@ echo $OUTPUT->doctype() ?>
<!-- START OF HEADER --> <!-- START OF HEADER -->
<div id="wrapper" class="clearfix"> <div id="wrapper" class="clearfix">
<div id="page-header"> <div id="page-header">
<div id="page-header-wrapper" class="clearfix"> <div id="page-header-wrapper" class="clearfix">
<h1 class="headermain"><?php echo $PAGE->heading ?></h1> <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
<div class="headermenu"> <div class="headermenu">
<?php <?php
echo $OUTPUT->login_info(); echo $OUTPUT->login_info();
echo $OUTPUT->lang_menu(); echo $OUTPUT->lang_menu();
echo $PAGE->headingmenu; echo $PAGE->headingmenu;
?> ?>
</div> </div>
</div> </div>
</div> </div>
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
<div class="clearer"></div> <!-- temporarily added on 06/25/10 --> <div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
...@@ -51,57 +60,57 @@ echo $OUTPUT->doctype() ?> ...@@ -51,57 +60,57 @@ echo $OUTPUT->doctype() ?>
<!-- START OF CONTENT --> <!-- START OF CONTENT -->
<div id="page-content-wrapper" class="clearfix"> <div id="page-content-wrapper" class="clearfix">
<div id="page-content"> <div id="page-content">
<div id="region-main-box"> <div id="region-main-box">
<div id="region-post-box"> <div id="region-post-box">
<div id="region-main-wrap"> <div id="region-main-wrap">
<div id="region-main"> <div id="region-main">
<div class="region-content"> <div class="region-content">
<?php echo $OUTPUT->main_content() ?> <?php echo $OUTPUT->main_content() ?>
</div> </div>
</div> </div>
</div> </div>
<?php if ($hassidepre) { ?> <?php if ($hassidepre) { ?>
<div id="region-pre"> <div id="region-pre" class="block-region">
<div class="region-content"> <div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?> <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<?php if ($hassidepost) { ?> <?php if ($hassidepost) { ?>
<div id="region-post"> <div id="region-post" class="block-region">
<div class="region-content"> <div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?> <?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- END OF CONTENT --> <!-- END OF CONTENT -->
<!-- START OF FOOTER --> <!-- START OF FOOTER -->
<div id="page-footer"> <div id="page-footer">
<p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p> <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
<?php <?php
echo $OUTPUT->login_info(); echo $OUTPUT->login_info();
echo $OUTPUT->home_link(); echo $OUTPUT->home_link();
echo $OUTPUT->standard_footer_html(); echo $OUTPUT->standard_footer_html();
?> ?>
</div> </div>
<!-- END OF FOOTER --> <!-- END OF FOOTER -->
</div> <!-- END #wrapper --> </div> <!-- END #wrapper -->
</div><!-- END #page --> </div><!-- END #page -->
......
...@@ -3,17 +3,27 @@ ...@@ -3,17 +3,27 @@
$hasheading = ($PAGE->heading); $hasheading = ($PAGE->heading);
$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter'])); $hasfooter = (empty($PAGE->layout_options['nofooter']));
$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); $hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
$custommenu = $OUTPUT->custom_menu();
$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
$bodyclasses = array(); $bodyclasses = array();
if ($hassidepre && !$hassidepost) { if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'side-pre-only'; $bodyclasses[] = 'side-pre-only';
} else if ($hassidepost && !$hassidepre) { } else if ($showsidepost && !$showsidepre) {
$bodyclasses[] = 'side-post-only'; $bodyclasses[] = 'side-post-only';
} else if (!$hassidepost && !$hassidepre) { } else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only'; $bodyclasses[] = 'content-only';
} }
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
echo $OUTPUT->doctype() ?> echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>> <html <?php echo $OUTPUT->htmlattributes() ?>>
...@@ -49,6 +59,10 @@ echo $OUTPUT->doctype() ?> ...@@ -49,6 +59,10 @@ echo $OUTPUT->doctype() ?>
</div> </div>
</div> </div>
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
<?php if ($hasnavbar) { ?> <?php if ($hasnavbar) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div> <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
...@@ -76,7 +90,7 @@ echo $OUTPUT->doctype() ?> ...@@ -76,7 +90,7 @@ echo $OUTPUT->doctype() ?>
</div> </div>
<?php if ($hassidepre) { ?> <?php if ($hassidepre) { ?>
<div id="region-pre"> <div id="region-pre" class="block-region">
<div class="region-content"> <div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?> <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div> </div>
...@@ -84,7 +98,7 @@ echo $OUTPUT->doctype() ?> ...@@ -84,7 +98,7 @@ echo $OUTPUT->doctype() ?>
<?php } ?> <?php } ?>
<?php if ($hassidepost) { ?> <?php if ($hassidepost) { ?>
<div id="region-post"> <div id="region-post" class="block-region">
<div class="region-content"> <div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?> <?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div> </div>
......
...@@ -3,17 +3,23 @@ ...@@ -3,17 +3,23 @@
$hasheading = ($PAGE->heading); $hasheading = ($PAGE->heading);
$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter'])); $hasfooter = (empty($PAGE->layout_options['nofooter']));
$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); $haslogininfo = (empty($PAGE->layout_options['nologininfo']));
$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
$custommenu = $OUTPUT->custom_menu();
$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
$bodyclasses = array(); $bodyclasses = array();
if ($hassidepre && !$hassidepost) { if ($showsidepre ) {
$bodyclasses[] = 'side-pre-only'; $bodyclasses[] = 'side-pre-only';
} else if ($hassidepost && !$hassidepre) { } else {
$bodyclasses[] = 'side-post-only';
} else if (!$hassidepost && !$hassidepre) {
$bodyclasses[] = 'content-only'; $bodyclasses[] = 'content-only';
} }
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
echo $OUTPUT->doctype() ?> echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>> <html <?php echo $OUTPUT->htmlattributes() ?>>
...@@ -49,6 +55,10 @@ echo $OUTPUT->doctype() ?> ...@@ -49,6 +55,10 @@ echo $OUTPUT->doctype() ?>
</div> </div>
</div> </div>
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
<?php if ($hasnavbar) { ?> <?php if ($hasnavbar) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div> <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment