Permalink
Browse files

MDL-22875 - general cleanup of layouts

  • Loading branch information...
1 parent 298053d commit ac6b6a481c8ef1b37c6239affe3822fd03bf26cb Patrick Malley committed Jun 25, 2010
Showing with 133 additions and 99 deletions.
  1. +58 −50 theme/canvas/layout/frontpage.php
  2. +75 −49 theme/canvas/layout/general.php
@@ -1,5 +1,8 @@
<?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);
@@ -26,77 +29,82 @@
<div id="page">
<!-- START OF HEADER -->
+
+ <div id="wrapper" class="clearfix">
- <div id="page-header" class="clearfix">
- <div id="page-header-wrapper">
- <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
- <div class="headermenu">
- <?php
- echo $OUTPUT->login_info();
- echo $OUTPUT->lang_menu();
- echo $PAGE->headingmenu;
- ?>
+ <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>
+
+ <div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
-<div id="page-content-wrapper">
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
+ <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 core_renderer::MAIN_CONTENT_TOKEN ?>
- </div>
- </div>
- </div>
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+ </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 ($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 } ?>
+ <?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>
+ </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>
+ </div> <!-- END #wrapper -->
+
+</div><!-- END #page -->
+
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
</html>
@@ -26,71 +26,97 @@
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
-<?php if ($hasheading || $hasnavbar) { ?>
- <div id="page-header">
- <?php if ($hasheading) { ?>
- <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
- <div class="headermenu"><?php
- echo $OUTPUT->login_info();
- if (!empty($PAGE->layout_options['langmenu'])) {
- echo $OUTPUT->lang_menu();
- }
- echo $PAGE->headingmenu
- ?></div><?php } ?>
+
+<!-- START OF HEADER -->
+
+ <?php if ($hasheading || $hasnavbar) { ?>
+ <div id="wrapper" class="clearfix">
+
+ <div id="page-header">
+ <div id="page-header-wrapper" class="clearfix">
+ <?php if ($hasheading) { ?>
+ <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+ <div class="headermenu">
+ <?php
+ echo $OUTPUT->login_info();
+ if (!empty($PAGE->layout_options['langmenu'])) {
+ echo $OUTPUT->lang_menu();
+ }
+ echo $PAGE->headingmenu;
+ ?>
+ </div>
+ <?php } ?>
+ </div>
+ </div>
+
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
<div class="navbutton"> <?php echo $PAGE->button; ?></div>
</div>
<?php } ?>
- </div>
+
<?php } ?>
+
<!-- END OF HEADER -->
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
+<!-- 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 core_renderer::MAIN_CONTENT_TOKEN ?>
- </div>
- </div>
- </div>
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+ </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 ($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 } ?>
+ <?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>
+ </div>
+ </div>
+
+<!-- END OF CONTENT -->
<!-- START OF FOOTER -->
- <?php if ($hasfooter) { ?>
- <div id="page-footer" class="clearfix">
- <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 if ($hasfooter) { ?>
+ <div id="page-footer" class="clearfix">
+ <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 } ?>
+
+ <?php if ($hasheading || $hasnavbar) { ?>
+ </div> <!-- END #wrapper -->
<?php } ?>
-</div>
+
+</div> <!-- END #page -->
+
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
</html>

0 comments on commit ac6b6a4

Please sign in to comment.