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

theme/standardlogo/footer.html

@@ -1,19 +1,19 @@
-
-</div> <!-- end div content -->
-
-<div id="footer">
-<hr />
-
 <?php
+
+    print_container_end(); // content container
+
+    print_container_start(false, '', 'footer');
+    echo '<hr />';
+
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
     echo '</p>';
+
+    echo $loggedinas;
+    echo $homelink;
+
+    print_container_end();
 ?>
-
-<?php echo $loggedinas ?>
-<?php echo $homelink ?>
-
-</div>
 </div>
 </body>
 </html>

theme/standardlogo/header.html

@@ -40,16 +40,16 @@
 
       //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1.
 ?>
-    <div id="header-home" class="clearfix">
+    <?php print_container_start(true, '', 'header-home'); ?>
         <h1 class="headermain"><img alt="Moodle" src="<?php echo $standardlogo ?>" /></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 //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation table with breadcrumbs  ?>
@@ -62,4 +62,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <div id="content">
+    <?php print_container_start(false, '', 'content'); ?>