Index: boron_zen.info
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/boron_zen.info,v
retrieving revision 1.1
diff -u -r1.1 boron_zen.info
--- boron_zen.info	5 Oct 2010 23:53:50 -0000	1.1
+++ boron_zen.info	21 Dec 2010 19:56:49 -0000
@@ -13,7 +13,7 @@
   ; base theme. Its unlikely you will ever need to change these, but they are
   ; required fields for a Zen sub-theme. The "engine" field is not used in a
   ; sub-theme since the engine is inherited from its base theme.
-core       = 6.x
+core       = 7.x
 base theme = zen
 
   ; This section adds CSS files to your theme. The media type is specified in
@@ -70,11 +70,14 @@
 regions[sidebar_second] = Second sidebar
 regions[navigation]     = Navigation bar
 regions[highlight]      = Highlighted content
+regions[highlighted] 	= Highlighted ; replaces $mission
 regions[content_top]    = Content top
 regions[content_bottom] = Content bottom
 regions[header]         = Header
 regions[footer]         = Footer
+regions[page_bottom] 	= Page bottom
 regions[page_closure]   = Page closure
+regions[page_top] 		= Page top
 
   ; Various page elements output by the theme can be toggled on and off. The
   ; "features" control which of these check boxes display on the
@@ -85,13 +88,13 @@
 features[] = logo
 features[] = name
 features[] = slogan
-features[] = mission
+;features[] = mission ; has been removed in D7
 features[] = node_user_picture
 features[] = comment_user_picture
 features[] = search
 features[] = favicon
-features[] = primary_links
-features[] = secondary_links
+features[] = main_menu
+features[] = secondary_menu
 
   ; Set the default settings to be used in theme-settings.php
 settings[zen_block_editing]        = 1
Index: css/blocks.css
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/css/blocks.css,v
retrieving revision 1.1
diff -u -r1.1 blocks.css
--- css/blocks.css	5 Oct 2010 23:53:50 -0000	1.1
+++ css/blocks.css	21 Dec 2010 19:43:35 -0000
@@ -43,19 +43,19 @@
 #block-block-1 /* First administrator-defined block */ {
 }
 
-#block-blog-0 /* "Recent blog posts" block */ {
+#block-blog-recent /* "Recent blog posts" block */ {
 }
 
-#block-book-0 /* "Book navigation" block for the current book's table of contents */ {
+#block-book-navigation /* "Book navigation" block for the current book's table of contents */ {
 }
 
-#block-comment-0 /* "Recent comments" block */ {
+#block-comment-recent /* "Recent comments" block */ {
 }
 
-#block-forum-0 /* "Active forum topics" block */ {
+#block-forum-active /* "Active forum topics" block */ {
 }
 
-#block-forum-1 /* "New forum topics" block */ {
+#block-forum-new /* "New forum topics" block */ {
 }
 
 #block-menu-primary-links /* "Primary links" block */ {
@@ -64,29 +64,29 @@
 #block-menu-secondary-links /* "Secondary links" block */ {
 }
 
-#block-node-0 /* "Syndicate" block for primary RSS feed */ {
+#block-node-syndicate /* "Syndicate" block for primary RSS feed */ {
 }
 
-#block-poll-0 /* "Most recent poll" block */ {
+#block-poll-recent /* "Most recent poll" block */ {
 }
 
-#block-profile-0 /* "Author information" block for the profile of the page's author */ {
+#block-profile-author-information /* "Author information" block for the profile of the page's author */ {
 }
 
-#block-search-0 /* "Search form" block */ {
+#block-search-form /* "Search form" block */ {
 }
 
-#block-statistics-0 /* "Popular content" block */ {
+#block-statistics-popular /* "Popular content" block */ {
 }
 
-#block-user-0 /* "User login form" block */ {
+#block-user-login /* "User login form" block */ {
 }
 
-#block-user-1 /* "Navigation" block for Drupal navigation menu */ {
+#block-system-navigation /* "Navigation" block for Drupal navigation menu */ {
 }
 
-#block-user-2 /* "Who's new" block for a list of the newest users */ {
+#block-user-new /* "Who's new" block for a list of the newest users */ {
 }
 
-#block-user-3 /* "Who's online" block for a list of the online users */ {
+#block-user-online /* "Who's online" block for a list of the online users */ {
 }
Index: css/drupal6-reference.css
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/css/drupal6-reference.css,v
retrieving revision 1.1
diff -u -r1.1 drupal6-reference.css
--- css/drupal6-reference.css	5 Oct 2010 23:53:50 -0000	1.1
+++ css/drupal6-reference.css	21 Dec 2010 19:49:35 -0000
@@ -932,7 +932,7 @@
 ** Markup free clearing
 ** Details: http://www.positioniseverything.net/easyclearing.html
 */
-.clear-block:after {
+.clearfix:after {
   content: ".";
   display: block;
   height: 0;
@@ -940,15 +940,15 @@
   visibility: hidden;
 }
 
-.clear-block {
+.clearfix {
   display: inline-block;
 }
 
 /* Hides from IE-mac \*/
-* html .clear-block {
+* html .clearfix {
   height: 1%;
 }
-.clear-block {
+.clearfix {
   display: block;
 }
 /* End hide from IE-mac */
Index: templates/book-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/templates/book-navigation.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 book-navigation.tpl.php
--- templates/book-navigation.tpl.php	5 Oct 2010 23:53:50 -0000	1.1
+++ templates/book-navigation.tpl.php	21 Dec 2010 19:49:35 -0000
@@ -35,7 +35,7 @@
     <?php print $tree; ?>
 
     <?php if ($has_links): ?>
-    <p class="page-links clear-block">
+    <p class="page-links clearfix">
       <?php if ($prev_url) : ?>
         <a href="<?php print $prev_url; ?>" class="page-previous" title="<?php print t('Go to previous page'); ?>"><?php print t('‹ ') . $prev_title; ?></a>
       <?php endif; ?>
Index: templates/forum-topic-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/templates/forum-topic-navigation.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 forum-topic-navigation.tpl.php
--- templates/forum-topic-navigation.tpl.php	5 Oct 2010 23:53:50 -0000	1.1
+++ templates/forum-topic-navigation.tpl.php	21 Dec 2010 19:49:35 -0000
@@ -24,7 +24,7 @@
  */
 ?>
 <?php if ($prev || $next): ?>
-  <footer class="forum-topic-navigation clear-block">
+  <footer class="forum-topic-navigation clearfix">
     <p class="page-links clearfix">
       <?php if ($prev): ?>
         <a href="<?php print $prev_url; ?>" class="topic-previous" title="<?php print t('Go to previous forum topic') ?>">‹ <?php print $prev_title ?></a>
Index: templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal/contributions/themes/boron_zen/templates/page.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 page.tpl.php
--- templates/page.tpl.php	5 Oct 2010 23:53:50 -0000	1.1
+++ templates/page.tpl.php	21 Dec 2010 23:16:07 -0000
@@ -3,125 +3,81 @@
 
 /**
  * @file
- * Theme implementation to display a single Drupal page.
+ * Default theme implementation to display a single Drupal page.
  *
  * Available variables:
  *
  * General utility variables:
  * - $base_path: The base URL path of the Drupal installation. At the very
  *   least, this will always default to /.
- * - $css: An array of CSS files for the current page.
  * - $directory: The directory the template is located in, e.g. modules/system
  *   or themes/garland.
- * - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement.
+ * - $is_front: TRUE if the current page is the front page.
  * - $logged_in: TRUE if the user is registered and signed in.
  * - $is_admin: TRUE if the user has permission to access administration pages.
  *
- * Page metadata:
- * - $language: (object) The language the site is being displayed in.
- *   $language->language contains its textual representation.
- *   $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $head_title: A modified version of the page title, for use in the TITLE tag.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- *   so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- *   for the page.
- * - $classes: String of classes that can be used to style contextually through
- *   CSS. It should be placed within the <body> tag. When selecting through CSS
- *   it's recommended that you use the body tag, e.g., "body.front". It can be
- *   manipulated through the variable $classes_array from preprocess functions.
- *   The default values can be one or more of the following:
- *   - front: Page is the home page.
- *   - not-front: Page is not the home page.
- *   - logged-in: The current viewer is logged in.
- *   - not-logged-in: The current viewer is not logged in.
- *   - node-type-[node type]: When viewing a single node, the type of that node.
- *     For example, if the node is a "Blog entry" it would result in "node-type-blog".
- *     Note that the machine name will often be in a short form of the human readable label.
- *   - page-views: Page content is generated from Views. Note: a Views block
- *     will not cause this class to appear.
- *   - page-panels: Page content is generated from Panels. Note: a Panels block
- *     will not cause this class to appear.
- *   The following only apply with the default 'sidebar_first' and 'sidebar_second' block regions:
- *     - two-sidebars: When both sidebars have content.
- *     - no-sidebars: When no sidebar content exists.
- *     - one-sidebar and sidebar-first or sidebar-second: A combination of the
- *       two classes when only one of the two sidebars have content.
- * - $node: Full node object. Contains data that may not be safe. This is only
- *   available if the current page is on the node's primary url.
- * - $menu_item: (array) A page's menu item. This is only available if the
- *   current page is in the menu.
- *
  * Site identity:
  * - $front_page: The URL of the front page. Use this instead of $base_path,
- *   when linking to the front page. This includes the language domain or prefix.
+ *   when linking to the front page. This includes the language domain or
+ *   prefix.
  * - $logo: The path to the logo image, as defined in theme configuration.
  * - $site_name: The name of the site, empty when display has been disabled
  *   in theme settings.
  * - $site_slogan: The slogan of the site, empty when display has been disabled
  *   in theme settings.
- * - $mission: The text of the site mission, empty when display has been disabled
- *   in theme settings.
  *
  * Navigation:
- * - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing the Primary menu links for the
+ * - $main_menu (array): An array containing the Main menu links for the
  *   site, if they have been configured.
- * - $secondary_links (array): An array containing the Secondary menu links for
+ * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
  * - $breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
  * - $title: The page title, for use in the actual HTML content.
- * - $messages: HTML for status and error messages. Should be displayed prominently.
- * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- *   view and edit tabs when displaying a node).
- * - $help: Dynamic help text, mostly for admin pages.
- * - $content: The main content of the current page.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ * - $messages: HTML for status and error messages. Should be displayed
+ *   prominently.
+ * - $tabs (array): Tabs linking to any sub-pages beneath the current page
+ *   (e.g., the view and edit tabs when displaying a node).
+ * - $action_links (array): Actions local to the page, such as 'Add menu' on the
+ *   menu administration interface.
  * - $feed_icons: A string of all feed icons for the current page.
- *
- * Footer/closing data:
- * - $footer_message: The footer message as defined in the admin settings.
- * - $closure: Final closing markup from any modules that have altered the page.
- *   This variable should always be output last, after all other dynamic content.
- *
- * Helper variables:
- * - $classes_array: Array of html class attribute values. It is flattened
- *   into a string within the variable $classes.
+ * - $node: The node object, if there is an automatically-loaded node
+ *   associated with the page, and the node ID is the second argument
+ *   in the page's path (e.g. node/12345 and node/12345/revisions, but not
+ *   comment/reply/12345).
  *
  * Regions:
- * - $content_top: Items to appear above the main content of the current page.
- * - $content_bottom: Items to appear below the main content of the current page.
- * - $navigation: Items for the navigation bar.
- * - $sidebar_first: Items for the first sidebar.
- * - $sidebar_second: Items for the second sidebar.
- * - $header: Items for the header region.
- * - $footer: Items for the footer region.
- * - $page_closure: Items to appear below the footer.
- *
- * The following variables are deprecated and will be removed in Drupal 7:
- * - $body_classes: This variable has been renamed $classes in Drupal 7.
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['highlighted']: Items for the highlighted content region.
+ * - $page['content']: The main content of the current page.
+ * - $page['sidebar_first']: Items for the first sidebar.
+ * - $page['sidebar_second']: Items for the second sidebar.
+ * - $page['header']: Items for the header region.
+ * - $page['footer']: Items for the footer region.
  *
  * @see template_preprocess()
  * @see template_preprocess_page()
- * @see zen_preprocess()
- * @see zen_process()
+ * @see template_process()
  */
 ?>
 <!DOCTYPE html>
 <html 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; ?>
+	<?php print $head; ?>
+	<title><?php print $head_title; ?></title>
+	<?php print $styles; ?>
+	<?php print $scripts; ?>
 </head>
-<body class="<?php print $classes; ?>">
+<body class="<?php print $classes; ?>" <?php print $attributes;?>>
 
-  <?php if ($primary_links): ?>
-    <div id="skip-link"><em><a href="#main-menu"><?php print t('Jump to Navigation'); ?></a></em> &darr;</div>
-  <?php endif; ?>
+<?php print $page_top; ?>
 
   <div id="page-wrapper"><div id="page">
 
@@ -151,44 +107,46 @@
         </div> <!-- /#name-and-slogan -->
       <?php endif; ?>
 
-      <?php if ($search_box): ?>
-        <div id="search-box"><?php print $search_box; ?></div>
-      <?php endif; ?>
-
-      <?php print $header; ?>
+      <?php print render($page['header']); ?>
+	  
+	  <?php if ($main_menu): ?>
+		<p id="skip-link"><em><a href="#navigation">Skip to Navigation</a></em> &darr;</p> 
+	  <?php endif; ?>
 
     </div></header> <!-- /.section, /#header -->
     
     <hr />
 
-    <div id="main-wrapper"><div id="main" class="clearfix<?php if ($primary_links || $navigation) { print ' with-navigation'; } ?>">
+    <div id="main-wrapper"><div id="main" class="clearfix<?php if ($main_menu) { print ' with-navigation'; } ?>">
 
       <div id="content" class="column"><div class="section">
 
-        <?php if ($mission): ?>
-          <div id="mission"><?php print $mission; ?></div>
-        <?php endif; ?>
+		<?php if ($page['highlighted']): ?>
+			<div id="highlighted"><?php print render($page['highlighted']); ?></div>
+		<?php endif; ?>
 
         <?php print $highlight; ?>
 
         <?php print $breadcrumb; ?>
 
-        <?php if ($title): ?>
-          <h1 class="title"><?php print $title; ?></h1>
-        <?php endif; ?>
+        <?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 print $messages; ?>
 
         <?php if ($tabs): ?>
-          <div class="tabs"><?php print $tabs; ?></div>
-        <?php endif; ?>
+			<div class="tabs"><?php print render($tabs); ?></div>
+		<?php endif; ?>
 
-        <?php print $help; ?>
+        <?php print render($page['help']); ?>
 
         <?php print $content_top; ?>
 
         <div id="content-area">
-          <?php print $content; ?>
+          <?php print render($page['content']); ?>
         </div>
 
         <?php print $content_bottom; ?>
@@ -201,25 +159,12 @@
       
       <hr />
 
-      <?php if ($primary_links || $navigation): ?>
-        <nav id="navigation"><div class="section clearfix">
-
-          <?php print theme(array('links__system_main_menu', 'links'), $primary_links,
-            array(
-              'id' => 'main-menu',
-              'class' => 'links clearfix',
-            ),
-            array(
-              'text' => t('Main menu'),
-              'level' => 'h2',
-              'class' => 'element-invisible',
-            ));
-          ?>
-
-          <?php print $navigation; ?>
-
-        </div></nav> <!-- /.section, /#navigation -->
-      <?php endif; ?>
+      <?php if ($main_menu): ?>
+  <hr />
+  <nav id="navigation" role="navigation"><div class="section">
+    <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+  </div></nav> <!-- /.section, /#navigation -->
+<?php endif; ?>
 
       <?php print $sidebar_first; ?>
 
@@ -229,35 +174,20 @@
     
     <hr />
 
-    <?php if ($footer || $footer_message || $secondary_links): ?>
-      <footer id="footer"><div class="section">
-
-        <?php print theme(array('links__system_secondary_menu', 'links'), $secondary_links,
-          array(
-            'id' => 'secondary-menu',
-            'class' => 'links clearfix',
-          ),
-          array(
-            'text' => t('Secondary menu'),
-            'level' => 'h2',
-            'class' => 'element-invisible',
-          ));
-        ?>
+    <footer id="footer" role="contentinfo"><div class="section">
 
-        <?php if ($footer_message): ?>
-          <div id="footer-message"><?php print $footer_message; ?></div>
-        <?php endif; ?>
+  <nav id="secondary-navigation"><div class="section">
+    <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+  </div></nav> <!-- /.section, /#navigation -->
 
-        <?php print $footer; ?>
+<?php print render($page['footer']); ?>
 
-      </div></footer> <!-- /.section, /#footer -->
-    <?php endif; ?>
+</div></footer> <!-- /.section, /#footer -->
 
   </div></div> <!-- /#page, /#page-wrapper -->
 
   <?php print $page_closure; ?>
-
-  <?php print $closure; ?>
+<?php print $page_bottom; ?>
 
 </body>
-</html>
+</html>
\ No newline at end of file