Merge branch 'MDL-31491_master' of git://github.com/kordan/moodle

This commit is contained in:
Aparup Banerjee 2012-02-07 14:10:26 +08:00
commit 74126453c5

View File

@ -1,8 +1,11 @@
<?php <?php
$hasheading = ($PAGE->heading); defined('MOODLE_INTERNAL') || die();
$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 = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$haslogininfo = (empty($PAGE->layout_options['nologininfo'])); $haslogininfo = (empty($PAGE->layout_options['nologininfo']));
@ -15,6 +18,7 @@ $bodyclasses = array();
if (!$showsidepre) { if (!$showsidepre) {
$bodyclasses[] = 'content-only'; $bodyclasses[] = 'content-only';
} }
if ($hascustommenu) { if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu'; $bodyclasses[] = 'has_custom_menu';
} }
@ -94,11 +98,16 @@ echo $OUTPUT->doctype() ?>
<!-- start of moodle content --> <!-- start of moodle content -->
<div id="page-content" class="clearfix"> <div id="page-content" class="clearfix">
<!-- main mandatory content of the moodle page -->
<div id="report-main-content"> <div id="report-main-content">
<div class="region-content"> <div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?> <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div> </div>
</div> </div>
<!-- end of main mandatory content of the moodle page -->
<!-- left column block - diplayed only if... -->
<?php if ($hassidepre) { ?> <?php if ($hassidepre) { ?>
<div id="report-region-wrap"> <div id="report-region-wrap">
<div id="report-region-pre" class="block-region"> <div id="report-region-pre" class="block-region">
@ -108,13 +117,15 @@ echo $OUTPUT->doctype() ?>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<!-- end of left column block - diplayed only if... -->
</div> </div>
<!-- end of moodle content --> <!-- end of moodle content -->
<div class="clearfix"></div> <div class="clearfix"></div>
<?php if ($hasframe) { ?> <?php if ($hasframe) { ?>
</div> <!-- end of wrapper --> </div> <!-- </wrapper> -->
</div> <!-- </frameright> --> </div> <!-- </frameright> -->
</div> <!-- </frameleft> --> </div> <!-- </frameleft> -->
<div id="framebottomright"> <div id="framebottomright">
@ -171,7 +182,6 @@ if ($hasfooter) {
//one more div is waiting to be closed //one more div is waiting to be closed
} ?> } ?>
<div class="moodledocsleft"> <div class="moodledocsleft">
<?php <?php
//echo $OUTPUT->login_info(); //echo $OUTPUT->login_info();