Skip to content
Browse files

Merge branch 'MDL-35986' of git://github.com/lazydaisy/moodle into MO…

…ODLE_23_STABLE
  • Loading branch information...
2 parents 0f46bd4 + cc3f17d commit 226398e7d0fdb0b534900cfeeb198bda2e0bcd96 @nebgor nebgor committed Oct 15, 2012
Showing with 111 additions and 78 deletions.
  1. +72 −63 theme/canvas/layout/frontpage.php
  2. +22 −8 theme/canvas/layout/general.php
  3. +17 −7 theme/canvas/layout/report.php
View
135 theme/canvas/layout/frontpage.php
@@ -1,19 +1,24 @@
<?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);
$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();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
+} else if ($showsidepost && !$showsidepre) {
$bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has_custom_menu';
+}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -30,81 +35,85 @@
<!-- START OF HEADER -->
- <div id="wrapper" class="clearfix">
-
- <div id="page-header">
- <div id="page-header-wrapper" class="clearfix">
- <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
- <div class="headermenu">
- <?php
- echo $OUTPUT->login_info();
- echo $OUTPUT->lang_menu();
- echo $PAGE->headingmenu;
- ?>
- </div>
- </div>
- </div>
+ <div id="wrapper" class="clearfix">
+
+ <div id="page-header">
+ <div id="page-header-wrapper" class="clearfix">
+ <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+ <div class="headermenu">
+ <?php
+ echo $OUTPUT->login_info();
+ echo $OUTPUT->lang_menu();
+ echo $PAGE->headingmenu;
+ ?>
+ </div>
+ </div>
+ </div>
+
+ <?php if ($hascustommenu) { ?>
+ <div id="custommenu"><?php echo $custommenu; ?></div>
+ <?php } ?>
<div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
- <div id="page-content-wrapper" class="clearfix">
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
-
- <div id="region-main-wrap">
- <div id="region-main">
- <div class="region-content">
- <?php echo $OUTPUT->main_content() ?>
- </div>
- </div>
- </div>
-
- <?php if ($hassidepre) { ?>
- <div id="region-pre">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
- </div>
- </div>
- <?php } ?>
-
- <?php if ($hassidepost) { ?>
- <div id="region-post">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-post') ?>
- </div>
- </div>
- <?php } ?>
-
- </div>
- </div>
- </div>
- </div>
+ <div id="page-content-wrapper" class="clearfix">
+ <div id="page-content">
+ <div id="region-main-box">
+ <div id="region-post-box">
+
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo $OUTPUT->main_content() ?>
+ </div>
+ </div>
+ </div>
+
+ <?php if ($hassidepre) { ?>
+ <div id="region-pre" class="block-region">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+ </div>
+ </div>
+ <?php } ?>
+
+ <?php if ($hassidepost) { ?>
+ <div id="region-post" class="block-region">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+ </div>
+ </div>
+ <?php } ?>
+
+ </div>
+ </div>
+ </div>
+ </div>
<!-- END OF CONTENT -->
<!-- START OF FOOTER -->
- <div id="page-footer">
- <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
+ <div id="page-footer">
+ <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
- <?php
- echo $OUTPUT->login_info();
- echo $OUTPUT->home_link();
- echo $OUTPUT->standard_footer_html();
- ?>
- </div>
+ <?php
+ echo $OUTPUT->login_info();
+ echo $OUTPUT->home_link();
+ echo $OUTPUT->standard_footer_html();
+ ?>
+ </div>
<!-- END OF FOOTER -->
- </div> <!-- END #wrapper -->
+ </div> <!-- END #wrapper -->
</div><!-- END #page -->
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
-</html>
+</html>
View
30 theme/canvas/layout/general.php
@@ -3,17 +3,27 @@
$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);
-$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $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();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre && !$showsidepost) {
$bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
+} else if ($showsidepost && !$showsidepre) {
$bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has_custom_menu';
+}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -49,6 +59,10 @@
</div>
</div>
+ <?php if ($hascustommenu) { ?>
+ <div id="custommenu"><?php echo $custommenu; ?></div>
+ <?php } ?>
+
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -76,15 +90,15 @@
</div>
<?php if ($hassidepre) { ?>
- <div id="region-pre">
+ <div id="region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost) { ?>
- <div id="region-post">
+ <div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
@@ -119,4 +133,4 @@
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
-</html>
+</html>
View
24 theme/canvas/layout/report.php
@@ -3,17 +3,23 @@
$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);
-$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $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();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre ) {
$bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
- $bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else {
$bodyclasses[] = 'content-only';
}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has_custom_menu';
+}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -49,6 +55,10 @@
</div>
</div>
+ <?php if ($hascustommenu) { ?>
+ <div id="custommenu"><?php echo $custommenu; ?></div>
+ <?php } ?>
+
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -106,4 +116,4 @@
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
-</html>
+</html>

0 comments on commit 226398e

Please sign in to comment.
Something went wrong with that request. Please try again.