Merged some unmerged changes from 1.7 (urs! ;-)

diff --git a/theme/standardblue/header.html b/theme/standardblue/header.html
index 0fd0b1dd5d7830174a816af4e5afd9ee6ee80587..eb96bddde93f3d6ccc497d3c1e1dd3b847c81188 100644 (file)
--- a/theme/standardblue/header.html
+++ b/theme/standardblue/header.html
@@ -17,29 +17,29 @@
     
 <div id="page">
 
-<?php if ($home) {  // This is what gets printed on the home page only  
+<?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
 ?>
-    <div id="header-home">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header-home" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <div id="header">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
-<?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <table class="navbar"><tr><td>
+<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
+      if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
+    <div class="navbar clearfix">
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
         <div class="navbutton"><?php echo $button; ?></div>
-    </td></tr></table>
+    </div>   
 <?php } else if ($heading) { // If no navigation, but a heading, then print a line  
 ?>
         <hr />
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
     <!-- END OF HEADER -->
     <div id="content">

diff --git a/theme/standardgreen/header.html b/theme/standardgreen/header.html
index 0fd0b1dd5d7830174a816af4e5afd9ee6ee80587..eb96bddde93f3d6ccc497d3c1e1dd3b847c81188 100644 (file)
--- a/theme/standardgreen/header.html
+++ b/theme/standardgreen/header.html
@@ -17,29 +17,29 @@
     
 <div id="page">
 
-<?php if ($home) {  // This is what gets printed on the home page only  
+<?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
 ?>
-    <div id="header-home">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header-home" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <div id="header">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
-<?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <table class="navbar"><tr><td>
+<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
+      if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
+    <div class="navbar clearfix">
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
         <div class="navbutton"><?php echo $button; ?></div>
-    </td></tr></table>
+    </div>   
 <?php } else if ($heading) { // If no navigation, but a heading, then print a line  
 ?>
         <hr />
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
     <!-- END OF HEADER -->
     <div id="content">

diff --git a/theme/standardred/header.html b/theme/standardred/header.html
index 0fd0b1dd5d7830174a816af4e5afd9ee6ee80587..eb96bddde93f3d6ccc497d3c1e1dd3b847c81188 100644 (file)
--- a/theme/standardred/header.html
+++ b/theme/standardred/header.html
@@ -17,29 +17,29 @@
     
 <div id="page">
 
-<?php if ($home) {  // This is what gets printed on the home page only  
+<?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
 ?>
-    <div id="header-home">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header-home" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <div id="header">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
-<?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <table class="navbar"><tr><td>
+<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
+      if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
+    <div class="navbar clearfix">
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
         <div class="navbutton"><?php echo $button; ?></div>
-    </td></tr></table>
+    </div>   
 <?php } else if ($heading) { // If no navigation, but a heading, then print a line  
 ?>
         <hr />
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
     <!-- END OF HEADER -->
     <div id="content">