Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.15
diff -u -p -r1.15 page.tpl.php
--- modules/system/page.tpl.php	22 Jan 2009 12:52:50 -0000	1.15
+++ modules/system/page.tpl.php	10 Feb 2009 20:38:47 -0000
@@ -76,7 +76,7 @@
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" lang="<?php print $language->language; ?>" dir="<?php print $language->dir; ?>">
 
 <head>
   <title><?php print $head_title; ?></title>
@@ -85,98 +85,108 @@
   <?php print $scripts; ?>
 </head>
 <body class="<?php print $body_classes; ?>">
-  <div id="page">
-    <div id="header">
+  <div id="page"><div id="page-inner">
+
+    <div id="header"><div id="header-inner" class="region-inner clear-block">
+
       <div id="logo-title">
 
-        <?php if (!empty($logo)): ?>
+        <?php if ($logo): ?>
           <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
             <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
           </a>
         <?php endif; ?>
 
         <div id="name-and-slogan">
-          <?php if (!empty($site_name)): ?>
-            <h1 id="site-name">
-              <a href="<?php print $front_page ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-            </h1>
+          <?php if ($site_name): ?>
+            <?php if ($title): ?>
+              <div id="site-name"><strong>
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </strong></div>
+            <?php else: /* Use h1 when the content title is empty */ ?>
+              <h1 id="site-name">
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </h1>
+            <?php endif; ?>
           <?php endif; ?>
 
-          <?php if (!empty($site_slogan)): ?>
+          <?php if ($site_slogan): ?>
             <div id="site-slogan"><?php print $site_slogan; ?></div>
           <?php endif; ?>
-        </div> <!-- /name-and-slogan -->
-      </div> <!-- /logo-title -->
+        </div> <!-- /#name-and-slogan -->
 
-      <?php if (!empty($search_box)): ?>
+      </div> <!-- /#logo-title -->
+
+      <?php if ($search_box): ?>
         <div id="search-box"><?php print $search_box; ?></div>
       <?php endif; ?>
 
-      <?php if (!empty($header)): ?>
+      <?php if ($header): ?>
         <div id="header-region">
           <?php print $header; ?>
         </div>
       <?php endif; ?>
 
-    </div> <!-- /header -->
+    </div></div> <!-- /#header-inner, /#header -->
 
-    <div id="container" class="clear-block">
+    <div id="main"><div id="main-inner" class="clear-block">
 
-      <div id="navigation" class="menu <?php if (!empty($main_menu)) { print "withmain"; } if (!empty($secondary_menu)) { print " withsecondary"; } ?> ">
-        <?php if (!empty($main_menu)): ?>
-          <div id="main-menu" class="clear-block">
-            <?php print theme('links', $main_menu, array('class' => 'links main-menu')); ?>
-          </div>
+      <div id="content" class="column"><div id="content-inner" class="region-inner">
+        <?php if ($breadcrumb): ?><div id="breadcrumb"><?php print $breadcrumb; ?></div><?php endif; ?>
+        <?php if ($mission): ?><div id="mission"><?php print $mission; ?></div><?php endif; ?>
+
+        <?php if ($title || $messages || $tabs || $help): ?>
+          <div id="content-header">
+            <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
+            <?php print $messages; ?>
+            <?php if ($tabs): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
+            <?php print $help; ?>
+          </div> <!-- /#content-header -->
         <?php endif; ?>
 
-        <?php if (!empty($secondary_menu)): ?>
-          <div id="secondary-menu" class="clear-block">
-            <?php print theme('links', $secondary_menu, array('class' => 'links secondary-menu')); ?>
-          </div>
-        <?php endif; ?>
-      </div> <!-- /navigation -->
+        <div id="content-area">
+          <?php print $content; ?>
+        </div> <!-- /#content-area -->
 
-      <?php if (!empty($left)): ?>
-        <div id="sidebar-left" class="column sidebar">
-          <?php print $left; ?>
-        </div> <!-- /sidebar-left -->
-      <?php endif; ?>
+        <?php print $feed_icons; ?>
 
-      <div id="main" class="column"><div id="main-squeeze">
-        <?php if (!empty($breadcrumb)): ?><div id="breadcrumb"><?php print $breadcrumb; ?></div><?php endif; ?>
-        <?php if (!empty($mission)): ?><div id="mission"><?php print $mission; ?></div><?php endif; ?>
-
-        <div id="content">
-          <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-          <?php if (!empty($tabs)): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
-          <?php if (!empty($messages)): print $messages; endif; ?>
-          <?php if (!empty($help)): print $help; endif; ?>
-          <div id="content-content" class="clear-block">
-            <?php print $content; ?>
-          </div> <!-- /content-content -->
-          <?php print $feed_icons; ?>
-        </div> <!-- /content -->
+      </div></div> <!-- /#content-inner, /#content -->
 
-      </div></div> <!-- /main-squeeze /main -->
+      <?php if ($main_menu): ?>
+        <div id="navigation">
+          <div id="main-menu" class="menu clear-block">
+            <?php print theme('links', $main_menu, array('class' => 'links main-menu')); ?>
+          </div> <!-- /#main-menu -->
+        </div> <!-- /#navigation -->
+      <?php endif; ?>
+
+      <?php if ($left): ?>
+        <div id="sidebar-left" class="column sidebar"><div id="sidebar-left-inner" class="region-inner">
+          <?php print $left; ?>
+        </div></div> <!-- /#sidebar-left-inner, /#sidebar-left -->
+      <?php endif; ?>
 
-      <?php if (!empty($right)): ?>
-        <div id="sidebar-right" class="column sidebar">
+      <?php if ($right): ?>
+        <div id="sidebar-right" class="column sidebar"><div id="sidebar-right-inner" class="region-inner">
           <?php print $right; ?>
-        </div> <!-- /sidebar-right -->
+        </div></div> <!-- /#sidebar-right-inner, /#sidebar-right -->
       <?php endif; ?>
 
-    </div> <!-- /container -->
+    </div></div> <!-- /#main-inner, /#main -->
 
-    <div id="footer-wrapper">
-      <div id="footer">
-        <?php print $footer_message; ?>
-        <?php if (!empty($footer)): print $footer; endif; ?>
-      </div> <!-- /footer -->
-    </div> <!-- /footer-wrapper -->
+    <div id="footer"><div id="footer-inner" class="region-inner">
+      <?php if ($secondary_menu): ?>
+        <div id="secondary-menu" class="clear-block">
+          <?php print theme('links', $secondary_menu, array('class' => 'links secondary-menu')); ?>
+        </div> <!-- /#secondary-menu -->
+      <?php endif; ?>
+      <?php if ($footer_message): ?><div id="footer-message"><?php print $footer_message; ?></div><?php endif; ?>
+      <?php print $footer; ?>
+    </div></div> <!-- /#footer-inner, /#footer -->
 
-    <?php print $closure; ?>
+  </div></div> <!-- /#page-inner, /#page -->
 
-  </div> <!-- /page -->
+  <?php print $closure; ?>
 
 </body>
 </html>
