Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/ninesixty/page.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 page.tpl.php
--- page.tpl.php	3 Apr 2009 01:13:54 -0000	1.3
+++ page.tpl.php	26 Dec 2010 18:41:01 -0000
@@ -1,18 +1,6 @@
 <?php
-// $Id: page.tpl.php,v 1.3 2009/04/03 01:13:54 dvessel Exp $
+// $Id:$
 ?>
-<!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 ?>">
-
-<head>
-  <title><?php print $head_title; ?></title>
-  <?php print $head; ?>
-  <?php print $styles; ?>
-  <?php print $scripts; ?>
-</head>
-
-<body class="<?php print $body_classes; ?> show-grid">
   <div id="page" class="container-16 clearfix">
 
     <div id="site-header" class="clearfix">
@@ -28,81 +16,71 @@
       <?php endif; ?>
       </div>
 
-    <?php if ($main_menu_links || $secondary_menu_links): ?>
-      <div id="site-menu" class="grid-12">
-        <?php print $main_menu_links; ?>
-        <?php print $secondary_menu_links; ?>
-      </div>
-    <?php endif; ?>
-
-    <?php if ($search_box): ?>
-      <div id="search-box" class="grid-6 prefix-10"><?php print $search_box; ?></div>
-    <?php endif; ?>
-    </div>
-
-
-    <div id="site-subheader" class="prefix-1 suffix-1 clearfix">
-    <?php if ($mission): ?>
-      <div id="mission" class="<?php print ns('grid-14', $header, 7); ?>">
-        <?php print $mission; ?>
-      </div>
-    <?php endif; ?>
-
-    <?php if ($header): ?>
-      <div id="header-region" class="region <?php print ns('grid-14', $mission, 7); ?> clearfix">
-        <?php print $header; ?>
-      </div>
-    <?php endif; ?>
-    </div>
-
+      <?php if ($primary_nav || $secondary_nav): ?>
+        <div id="site-menu" class="grid-12">
+          <?php print $primary_nav; ?>
+          <?php print $secondary_nav; ?>
+        </div>
+      <?php endif; ?>
+     </div><!--/#site-header-->
+    
+    <div id="site-subheader" class="clearfix">
+       <?php if ($page['header']): ?>
+        <div id="header-region" class="region <?php print ns('grid-16', $page['search_box'], 4); ?>">
+          <?php print render($page['header']); ?>
+        </div>
+      <?php endif; ?>
+      
+      <?php if ($page['search_box']): ?>
+        <div id="search-box" class="grid-4<?php if(!$page['header']) : print ' prefix-12'; endif; ?>">
+          <?php print render($page['search_box']); ?>
+        </div>
+      <?php endif; ?>
+    </div><!--/#site-subheader-->
 
-    <div id="main" class="column <?php print ns('grid-16', $left, 4, $right, 3) . ' ' . ns('push-4', !$left, 4); ?>">
+    <div id="main" class="column <?php print ns('grid-16', $page['sidebar_first'], 4, $page['sidebar_second'], 3) . ' ' . ns('push-4', !$page['sidebar_first'], 4); ?>">
+      <?php if ($page['highlighted']): ?>
+        <div id="highlighted">
+          <?php print render($page['highlighted']); ?>
+        </div>
+      <?php endif; ?>
       <?php print $breadcrumb; ?>
+      <?php print render($title_prefix); ?>
       <?php if ($title): ?>
         <h1 class="title" id="page-title"><?php print $title; ?></h1>
       <?php endif; ?>
+      <?php print render($title_suffix); ?>      
       <?php if ($tabs): ?>
-        <div class="tabs"><?php print $tabs; ?></div>
+        <div class="tabs"><?php print render($tabs); ?></div>
       <?php endif; ?>
       <?php print $messages; ?>
-      <?php print $help; ?>
-
+      <?php print render($page['help']); ?>
       <div id="main-content" class="region clearfix">
-        <?php print $content; ?>
+        <?php print render($page['content']); ?>
       </div>
-
       <?php print $feed_icons; ?>
     </div>
 
-  <?php if ($left): ?>
-    <div id="sidebar-left" class="column sidebar region grid-4 <?php print ns('pull-12', $right, 3); ?>">
-      <?php print $left; ?>
+  <?php if ($page['sidebar_first']): ?>
+    <div id="sidebar-first" class="column sidebar region grid-4 <?php print ns('pull-12', $page['sidebar_second'], 3); ?>">
+      <?php print render($page['sidebar_first']); ?>
     </div>
   <?php endif; ?>
 
-  <?php if ($right): ?>
-    <div id="sidebar-right" class="column sidebar region grid-3">
-      <?php print $right; ?>
+  <?php if ($page['sidebar_second']): ?>
+    <div id="sidebar-second" class="column sidebar region grid-3">
+      <?php print render($page['sidebar_second']); ?>
     </div>
   <?php endif; ?>
 
 
   <div id="footer" class="prefix-1 suffix-1">
-    <?php if ($footer): ?>
+    <?php if ($page['footer']): ?>
       <div id="footer-region" class="region grid-14 clearfix">
-        <?php print $footer; ?>
-      </div>
-    <?php endif; ?>
-
-    <?php if ($footer_message): ?>
-      <div id="footer-message" class="grid-14">
-        <?php print $footer_message; ?>
+        <?php print render($page['footer']); ?>
       </div>
     <?php endif; ?>
   </div>
 
 
-  </div>
-  <?php print $closure; ?>
-</body>
-</html>
+  </div><!--/#page -->

