From: nicolasconnault <nicolasconnault>
Date: Thu, 20 Aug 2009 08:50:03 +0000 (+0000)
Subject: MDL-19824 upgraded calls to print_container*
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fd09397ee13e88cb6fad4b1e765c9418a2a5b3f8;p=moodle.git

MDL-19824 upgraded calls to print_container*
---

diff --git a/theme/anomaly/footer.html b/theme/anomaly/footer.html
index 94b10ed34e..153cbfe5c9 100644
--- a/theme/anomaly/footer.html
+++ b/theme/anomaly/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
 ?>
 
@@ -27,7 +27,7 @@
         </div>
     </div>
 </div>
-<?php print_container_end(); ?>
+<?php echo $OUTPUT->container_end(); ?>
                                 </div>
                             </div>
                         </div>
diff --git a/theme/anomaly/header.html b/theme/anomaly/header.html
index 0700af48fd..fa145b966d 100644
--- a/theme/anomaly/header.html
+++ b/theme/anomaly/header.html
@@ -33,7 +33,7 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
     
     <div id="header-t">
     	<div id="header-r">
@@ -48,10 +48,10 @@
     	</div>
     </div>
 
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
     <div id="header-t">
     	<div id="header-r">
     		<div id="header-l">
@@ -62,7 +62,7 @@
 				</div>
 			</div>
 		</div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -74,4 +74,4 @@
 ?>
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/colors/footer.html b/theme/colors/footer.html
index 9f8460dd41..3788820a19 100755
--- a/theme/colors/footer.html
+++ b/theme/colors/footer.html
@@ -1,8 +1,8 @@
 
 <?php    
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(true, '', 'footer');
+    echo $OUTPUT->container_start('clearfix footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -18,7 +18,7 @@
         echo $performanceinfo;
     }
     
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 <?php
diff --git a/theme/colors/header.html b/theme/colors/header.html
index 3368232dab..48f4ce8be0 100755
--- a/theme/colors/header.html
+++ b/theme/colors/header.html
@@ -14,19 +14,19 @@
     
 <?php if ($home) {  // This is what gets printed on the home page only  
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 	<div class="navbar clearfix">
 		&nbsp;      
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
     <div class="navbar clearfix">
     <?php if ($navigation) { // This is the navigation table with breadcrumbs
     ?>
@@ -36,4 +36,4 @@
     </div>
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/cornflower/footer.html b/theme/cornflower/footer.html
index a7fea6e95c..78d16c8c3e 100644
--- a/theme/cornflower/footer.html
+++ b/theme/cornflower/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -23,7 +23,7 @@
         echo $performanceinfo;
     }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html
index 74383a4529..1141f23312 100644
--- a/theme/cornflower/header.html
+++ b/theme/cornflower/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: warning: ALT text will need editing when logo changes. 'headermain' is now H1.
 
       if ($home) {  // home page ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->themewww.'/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->themewww.'/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
     <div class="clearer"></div>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
@@ -43,4 +43,4 @@
 <?php }  ?>
     <!-- END OF HEADER -->
     <div class="clearer"></div>
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html
index cce3af0ec7..87ec37e730 100644
--- a/theme/custom_corners/footer.html
+++ b/theme/custom_corners/footer.html
@@ -1,4 +1,4 @@
-<?php print_container_end(); ?><!-- end container Content -->
+<?php echo $OUTPUT->container_end(); ?><!-- end container Content -->
 <!-- START OF FOOTER -->
 <?php 
 
@@ -10,7 +10,7 @@ if (function_exists('is_in_popup')) {
 }
 
 if (!$inpopup) { 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -26,7 +26,7 @@ if (!$inpopup) {
         echo $performanceinfo;
     }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 
 } // end if inpopup
 
diff --git a/theme/custom_corners/header.html b/theme/custom_corners/header.html
index 559aaeac09..508df7552f 100644
--- a/theme/custom_corners/header.html
+++ b/theme/custom_corners/header.html
@@ -49,13 +49,13 @@
 <?php if (!$inpopup) { 
     if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
         <div class="navbar clearfix">
@@ -65,9 +65,9 @@
             <div class="navbutton"><?php echo $button; ?></div>
             <?php } ?>
         </div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php }
     }
 ?>
     <!-- END OF HEADER -->
-<?php print_container_start(false, '', 'content'); ?>
+<?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/formal_white/footer.html b/theme/formal_white/footer.html
index 63070788c5..aff0409aa4 100644
--- a/theme/formal_white/footer.html
+++ b/theme/formal_white/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -32,7 +32,7 @@
         </ul></div>
 <?php }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/formal_white/header.html b/theme/formal_white/header.html
index c781b7a907..bced405b64 100644
--- a/theme/formal_white/header.html
+++ b/theme/formal_white/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo.jpg' /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo_small.jpg' /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
        <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/index.php b/theme/index.php
index b259b3573f..588138a4db 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -65,7 +65,7 @@ if ($choose and confirm_sesskey()) {
 admin_externalpage_print_header('themeselector');
 echo $OUTPUT->heading(get_string('themes'));
 
-$table = new stdClass;
+$table = new html_table();
 $table->id = 'adminthemeselector';
 $table->head = array(get_string('theme'), get_string('info'));
 
@@ -126,8 +126,8 @@ foreach ($themes as $themename => $themedir) {
         $infocell .= "<ul>\n<li>" . implode("</li>\n<li>", $infoitems) . "</li>\n</ul>\n";
     }
     if ($themename != $CFG->theme) {
-        $infocell .= print_single_button('index.php', array('choose' => $themename, 'sesskey' => $sesskey),
-                get_string('choose'), 'get', null, true);
+        $infocell .= $OUTPUT->button(html_form::make_button('index.php', array('choose' => $themename, 'sesskey' => $sesskey),
+                get_string('choose'), 'get'));
 
     }
     $row[] = $infocell;
@@ -138,7 +138,7 @@ foreach ($themes as $themename => $themedir) {
     }
 }
 
-print_table($table);
+echo $OUTPUT->table($table);
 
 echo $OUTPUT->footer();
 ?>
diff --git a/theme/lines/footer.html b/theme/lines/footer.html
index 63fe839465..2193d1be04 100755
--- a/theme/lines/footer.html
+++ b/theme/lines/footer.html
@@ -1,8 +1,8 @@
 
 <?php    
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(true, '', 'footer');
+    echo $OUTPUT->container_start('clearfix footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -18,7 +18,7 @@
         echo $performanceinfo;
     }
     
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 <?php
diff --git a/theme/lines/header.html b/theme/lines/header.html
index a730b603fc..7bb3e9c20d 100755
--- a/theme/lines/header.html
+++ b/theme/lines/header.html
@@ -15,19 +15,19 @@
     
 <?php if ($home) {  // This is what gets printed on the home page only  
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 	<div class="navbar clearfix">
 		&nbsp;      
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
     <div class="navbar clearfix">
     <?php if ($navigation) { // This is the navigation table with breadcrumbs
     ?>
@@ -37,4 +37,4 @@
     </div>
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/metal/footer.html b/theme/metal/footer.html
index bb3b585c20..e455b05c5b 100644
--- a/theme/metal/footer.html
+++ b/theme/metal/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<hr />';
     echo $loggedinas;
@@ -25,7 +25,7 @@
         </ul></div>
 <?php }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/metal/header.html b/theme/metal/header.html
index 19b7b63762..a12259bad9 100644
--- a/theme/metal/header.html
+++ b/theme/metal/header.html
@@ -19,16 +19,16 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
     <div class="clearer">&nbsp;</div>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
@@ -42,4 +42,4 @@
 <?php } ?>
     <div class="clearer">&nbsp;</div>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/oceanblue/footer.html b/theme/oceanblue/footer.html
index 63070788c5..aff0409aa4 100644
--- a/theme/oceanblue/footer.html
+++ b/theme/oceanblue/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -32,7 +32,7 @@
         </ul></div>
 <?php }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/oceanblue/header.html b/theme/oceanblue/header.html
index 8876ebe0c3..86dac6328d 100644
--- a/theme/oceanblue/header.html
+++ b/theme/oceanblue/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/orangewhite/footer.html b/theme/orangewhite/footer.html
index 101b724aea..6d1eb8aed2 100644
--- a/theme/orangewhite/footer.html
+++ b/theme/orangewhite/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -11,7 +11,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/orangewhite/header.html b/theme/orangewhite/header.html
index 5e6e2a66f4..2115554c94 100644
--- a/theme/orangewhite/header.html
+++ b/theme/orangewhite/header.html
@@ -19,7 +19,7 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     <?php print_container_end(); ?>
@@ -27,7 +27,7 @@
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
         <!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> -->
@@ -41,4 +41,4 @@
     </div>
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/orangewhitepda/footer.html b/theme/orangewhitepda/footer.html
index 101b724aea..6d1eb8aed2 100644
--- a/theme/orangewhitepda/footer.html
+++ b/theme/orangewhitepda/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -11,7 +11,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/orangewhitepda/header.html b/theme/orangewhitepda/header.html
index 5e6e2a66f4..00c0b62d0c 100644
--- a/theme/orangewhitepda/header.html
+++ b/theme/orangewhitepda/header.html
@@ -19,19 +19,19 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
     <div class="navbar">
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
         <!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> -->
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs
 ?>
@@ -41,4 +41,4 @@
     </div>
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standard/footer.html b/theme/standard/footer.html
index 6c75742330..eedcbdeca2 100644
--- a/theme/standard/footer.html
+++ b/theme/standard/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
@@ -31,7 +31,7 @@
         </ul></div>
 <?php }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/standard/header.html b/theme/standard/header.html
index 8876ebe0c3..86dac6328d 100644
--- a/theme/standard/header.html
+++ b/theme/standard/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standardblue/footer.html b/theme/standardblue/footer.html
index 635ad3500a..e1669c74eb 100644
--- a/theme/standardblue/footer.html
+++ b/theme/standardblue/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     echo '<hr />';
 
     echo '<p class="helplink">';
@@ -12,7 +12,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/standardblue/header.html b/theme/standardblue/header.html
index 8876ebe0c3..86dac6328d 100644
--- a/theme/standardblue/header.html
+++ b/theme/standardblue/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standardgreen/footer.html b/theme/standardgreen/footer.html
index 635ad3500a..e1669c74eb 100644
--- a/theme/standardgreen/footer.html
+++ b/theme/standardgreen/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     echo '<hr />';
 
     echo '<p class="helplink">';
@@ -12,7 +12,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/standardgreen/header.html b/theme/standardgreen/header.html
index 8876ebe0c3..86dac6328d 100644
--- a/theme/standardgreen/header.html
+++ b/theme/standardgreen/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standardlogo/footer.html b/theme/standardlogo/footer.html
index 635ad3500a..e1669c74eb 100644
--- a/theme/standardlogo/footer.html
+++ b/theme/standardlogo/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     echo '<hr />';
 
     echo '<p class="helplink">';
@@ -12,7 +12,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/standardlogo/header.html b/theme/standardlogo/header.html
index bde61b4da5..f261a54a3f 100644
--- a/theme/standardlogo/header.html
+++ b/theme/standardlogo/header.html
@@ -34,16 +34,16 @@
 
       //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1.
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><img alt="Moodle" src="<?php echo $standardlogo ?>" /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation table with breadcrumbs  ?>
@@ -56,4 +56,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standardred/footer.html b/theme/standardred/footer.html
index 635ad3500a..e1669c74eb 100644
--- a/theme/standardred/footer.html
+++ b/theme/standardred/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     echo '<hr />';
 
     echo '<p class="helplink">';
@@ -12,7 +12,7 @@
     echo $loggedinas;
     echo $homelink;
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/standardred/header.html b/theme/standardred/header.html
index 8876ebe0c3..86dac6328d 100644
--- a/theme/standardred/header.html
+++ b/theme/standardred/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>
diff --git a/theme/standardwhite/footer.html b/theme/standardwhite/footer.html
index 443ebe83fc..2a348043ef 100644
--- a/theme/standardwhite/footer.html
+++ b/theme/standardwhite/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
     echo "<hr />";
 
     echo '<p class="helplink">';
@@ -24,7 +24,7 @@
           <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
         </ul></div>
 <?php } 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 
 </div>
diff --git a/theme/standardwhite/header.html b/theme/standardwhite/header.html
index deb3ec5762..1bbab044d7 100644
--- a/theme/standardwhite/header.html
+++ b/theme/standardwhite/header.html
@@ -20,16 +20,16 @@
 <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
       if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } ?>
 <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
       if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
@@ -42,4 +42,4 @@
         <hr />
 <?php } ?>
     <!-- END OF HEADER -->
-    <?php print_container_start(true, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('clearfix content'); ?>
diff --git a/theme/wood/footer.html b/theme/wood/footer.html
index 9692ad2af9..d3a2a79e49 100644
--- a/theme/wood/footer.html
+++ b/theme/wood/footer.html
@@ -1,8 +1,8 @@
 <?php
 
-    print_container_end(); // content container
+    echo $OUTPUT->container_end(); // content container
 
-    print_container_start(false, '', 'footer');
+    echo $OUTPUT->container_start('footer');
 
     echo "<div id=\"footer-bar\">";
     echo '<span class="helplink">';
@@ -17,7 +17,7 @@
         echo $performanceinfo;
     }
 
-    print_container_end();
+    echo $OUTPUT->container_end();
 ?>
 </div>
 </body>
diff --git a/theme/wood/header.html b/theme/wood/header.html
index 2eeb76bf39..978e8bfc91 100644
--- a/theme/wood/header.html
+++ b/theme/wood/header.html
@@ -19,16 +19,16 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
-    <?php print_container_start(true, '', 'header-home'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header-home'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
-    <?php print_container_start(true, '', 'header'); ?>
+    <?php echo $OUTPUT->container_start('clearfix header'); ?>
         <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
-    <?php print_container_end(); ?>
+    <?php echo $OUTPUT->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 -->
-    <?php print_container_start(false, '', 'content'); ?>
+    <?php echo $OUTPUT->container_start('content'); ?>