MDL-19824 upgraded calls to print_container*

This commit is contained in:
nicolasconnault 2009-08-20 08:50:03 +00:00
parent c533926389
commit fd09397ee1
35 changed files with 138 additions and 138 deletions

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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();
?>

View File

@ -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

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>

View File

@ -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>

View File

@ -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'); ?>