Index: templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/tao/templates/Attic/page.tpl.php,v
retrieving revision 1.1.2.1.2.3
diff -u -p -r1.1.2.1.2.3 page.tpl.php
--- templates/page.tpl.php	30 Sep 2010 13:49:19 -0000	1.1.2.1.2.3
+++ templates/page.tpl.php	30 Sep 2010 14:07:25 -0000
@@ -1,57 +1,61 @@
-<?php if ($page['help'] || ($show_messages && $messages)): ?>
-  <div id='console'><div class='limiter clearfix'>
-    <?php print render($page['help']); ?>
-    <?php if ($show_messages && $messages): print $messages; endif; ?>
-  </div></div>
-<?php endif; ?>
-
-<?php if ($page['header']): ?>
-  <div id='header'><div class='limiter clearfix'>
-    <?php print render($page['header']); ?>
-  </div></div>
-<?php endif; ?>
+<div id='main'><div class='limiter clearfix'>
 
-<div id='branding'><div class='limiter clearfix'>
-  <?php if ($site_name): ?><h1 class='site-name'><?php print $site_name ?></h1><?php endif; ?>
-</div></div>
-
-<div id='navigation'><div class='limiter clearfix'>
-  <?php if (isset($main_menu)) : ?>
-    <?php print theme('links', array('links' => $main_menu, 'attributes' => array('class' => 'links main-menu'))) ?>
+  <?php if ($page['help'] || ($show_messages && $messages)): ?>
+    <div id='console'><div class='limiter clearfix'>
+      <?php print render($page['help']); ?>
+      <?php if ($show_messages && $messages): print $messages; endif; ?>
+    </div></div>
   <?php endif; ?>
-  <?php if (isset($secondary_menu)) : ?>
-    <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('class' => 'links secondary-menu'))) ?>
+
+  <?php if ($page['header']): ?>
+    <div id='header'><div class='limiter clearfix'>
+      <?php print render($page['header']); ?>
+    </div></div>
   <?php endif; ?>
-</div></div>
 
-<?php if ($page['highlighted']): ?>
-  <div id='highlighted'><div class='limiter clearfix'>
-    <?php print render($page['highlighted']); ?>
+  <div id='branding'><div class='limiter clearfix'>
+    <?php if ($site_name): ?><h1 class='site-name'><?php print $site_name ?></h1><?php endif; ?>
   </div></div>
-<?php endif; ?>
 
-<div id='page'><div class='limiter clearfix'>
+  <div id='navigation'><div class='limiter clearfix'>
+    <?php if (isset($main_menu)) : ?>
+      <?php print theme('links', array('links' => $main_menu, 'attributes' => array('class' => 'links main-menu'))) ?>
+    <?php endif; ?>
+    <?php if (isset($secondary_menu)) : ?>
+      <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('class' => 'links secondary-menu'))) ?>
+    <?php endif; ?>
+  </div></div>
 
-  <?php if ($page['sidebar_first']): ?>
-    <div id='left' class='clearfix'><?php print render($page['sidebar_first']) ?></div>
+  <?php if ($page['highlighted']): ?>
+    <div id='highlighted'><div class='limiter clearfix'>
+      <?php print render($page['highlighted']); ?>
+    </div></div>
   <?php endif; ?>
 
-  <div id='main-content' class='clearfix'>
-    <?php if ($breadcrumb) print $breadcrumb; ?>
-    <?php if ($title): ?><h1 class='page-title'><?php print $title ?></h1><?php endif; ?>
-    <?php if ($primary_local_tasks): ?><ul class='links clearfix'><?php print render($primary_local_tasks) ?></ul><?php endif; ?>
-    <?php if ($secondary_local_tasks): ?><ul class='links clearfix'><?php print render($secondary_local_tasks) ?></ul><?php endif; ?>
-    <?php if ($action_links): ?><ul class='links clearfix'><?php print render($action_links); ?></ul><?php endif; ?>
-    <div id='content' class='clearfix'><?php print render($page['content']) ?></div>
-  </div>
+  <div id='main'><div class='limiter clearfix'>
 
-  <?php if ($page['sidebar_second']): ?>
-    <div id='right' class='clearfix'><?php print render($page['sidebar_second']) ?></div>
-  <?php endif; ?>
+    <?php if ($page['sidebar_first']): ?>
+      <div id='left' class='clearfix'><?php print render($page['sidebar_first']) ?></div>
+    <?php endif; ?>
+
+    <div id='main-content' class='clearfix'>
+      <?php if ($breadcrumb) print $breadcrumb; ?>
+      <?php if ($title): ?><h1 class='page-title'><?php print $title ?></h1><?php endif; ?>
+      <?php if ($primary_local_tasks): ?><ul class='links clearfix'><?php print render($primary_local_tasks) ?></ul><?php endif; ?>
+      <?php if ($secondary_local_tasks): ?><ul class='links clearfix'><?php print render($secondary_local_tasks) ?></ul><?php endif; ?>
+      <?php if ($action_links): ?><ul class='links clearfix'><?php print render($action_links); ?></ul><?php endif; ?>
+      <div id='content' class='clearfix'><?php print render($page['content']) ?></div>
+    </div>
+
+    <?php if ($page['sidebar_second']): ?>
+      <div id='right' class='clearfix'><?php print render($page['sidebar_second']) ?></div>
+    <?php endif; ?>
 
-</div></div>
+  </div></div>
+
+  <div id="footer"><div class='limiter clearfix'>
+    <?php print $feed_icons ?>
+    <?php print render($page['footer']) ?>
+  </div></div>
 
-<div id="footer"><div class='limiter clearfix'>
-  <?php print $feed_icons ?>
-  <?php print render($page['footer']) ?>
 </div></div>