MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE

theme/wood/footer.html

@@ -1,23 +1,24 @@
-
-</div> <!-- end div content -->
-
-<div id="footer">
-
 <?php
+
+    print_container_end(); // content container
+
+    print_container_start(false, '', 'footer');
+
     echo "<div id=\"footer-bar\">";
     echo '<span class="helplink">';
     echo '&nbsp;'.page_doc_link(get_string('moodledocslink'));
     echo '</span>';
     echo "</div>";
+
+    echo $loggedinas;
+    echo $homelink;
+
+    if (!empty($performanceinfo)) {
+        echo $performanceinfo;
+    }
+
+    print_container_end();
 ?>
-
-<?php echo $loggedinas ?>
-<?php echo $homelink ?>
-
-<?php if (!empty($performanceinfo)) {
-    echo $performanceinfo;
-} ?>
-</div>
 </div>
 </body>
 </html>

theme/wood/header.html

@@ -19,16 +19,16 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
-    <div id="header-home" class="clearfix">
+    <?php print_container_start(true, '', 'header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    </div>
+    <?php print_container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <div id="header" class="clearfix">
+    <?php print_container_start(true, '', 'header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    </div>
+    <?php print_container_end(); ?>
 <?php } ?>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
     <div class="navbar clearfix">
@@ -41,4 +41,4 @@
 <?php } ?>
     <div class="clearer">&nbsp;</div>
     <!-- END OF HEADER -->
-    <div id="content">
+    <?php print_container_start(false, '', 'content'); ?>