Index: block.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/framework/block.tpl.php,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 block.tpl.php
--- block.tpl.php	28 Nov 2008 06:14:30 -0000	1.1.6.2
+++ block.tpl.php	26 Nov 2010 04:34:32 -0000
@@ -1,14 +1,56 @@
 <?php
-// $Id: block.tpl.php,v 1.1.6.2 2008/11/28 06:14:30 andregriffin Exp $
+// $Id: block.tpl.php,v 1.10 2010/04/26 14:10:40 dries Exp $
+
+/**
+ * @file
+ * Default theme implementation to display a block.
+ *
+ * Available variables:
+ * - $block->subject: Block title.
+ * - $content: Block content.
+ * - $block->module: Module that generated the block.
+ * - $block->delta: An ID for the block, unique within each module.
+ * - $block->region: The block region embedding the current block.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - block: The current template type, i.e., "theming hook".
+ *   - block-[module]: The module generating the block. For example, the user module
+ *     is responsible for handling the default user navigation block. In that case
+ *     the class would be "block-user".
+ * - $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_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Helper variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
+ * - $zebra: Same output as $block_zebra but independent of any block region.
+ * - $block_id: Counter dependent on each block region.
+ * - $id: Same output as $block_id but independent of any block region.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ * - $block_html_id: A valid HTML ID and guaranteed unique.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_block()
+ * @see template_process()
+ */
 ?>
-<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="block block-<?php print $block->module ?>">
+<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
-  <?php if (!empty($block->subject)): ?>
-    <h3><?php print $block->subject ?></h3>
-  <?php endif;?>
+  <?php print render($title_prefix); ?>
+<?php if ($block->subject): ?>
+  <h2<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
+<?php endif;?>
+  <?php print render($title_suffix); ?>
 
-  <div class="content">
-    <?php print $block->content ?>
+  <div class="content"<?php print $content_attributes; ?>>
+    <?php print $content ?>
   </div>
-
 </div>
Index: framework.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/framework/framework.info,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 framework.info
--- framework.info	28 Nov 2008 06:14:30 -0000	1.1.4.2
+++ framework.info	26 Nov 2010 04:34:32 -0000
@@ -3,10 +3,29 @@
 name = Framework
 description = Framework is a blank canvas for theme developers. Use Framework as a starting point to help facilitate your theme development.
 version = VERSION
-core = 6.x
+core = 7.x
 engine = phptemplate
 stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 
+regions[page_top] = Page top
+regions[header] = Header
+regions[highlight] = Highlight
+regions[help] = Help
+regions[content] = Content
+regions[sidebar_first] = First sidebar
+regions[sidebar_second] = Second sidebar
+regions[footer] = Footer
+regions[page_bottom] = Page bottom
+regions[page_top] = Page top
+regions[page_bottom] = Page bottom
 
-
+features[] = logo
+features[] = name
+features[] = slogan
+features[] = node_user_picture
+features[] = comment_user_picture
+features[] = search
+features[] = favicon
+features[] = main_menu
+features[] = secondary_menu
Index: node.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/framework/node.tpl.php,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 node.tpl.php
--- node.tpl.php	28 Nov 2008 06:14:30 -0000	1.1.6.2
+++ node.tpl.php	26 Nov 2010 04:34:32 -0000
@@ -1,40 +1,48 @@
 <?php
 // $Id: node.tpl.php,v 1.1.6.2 2008/11/28 06:14:30 andregriffin Exp $
 ?>
-<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?>">
+<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
 
   <?php print $picture ?>
 
-  <?php if ($page == 0): ?>
+  <?php print render($title_prefix); ?>
+  <?php if (!$page): ?>
     <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   <?php endif; ?>
+  <?php print render($title_suffix); ?>
 
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted; ?></span>
+  <?php if ($display_submitted): ?>
+    <div class="meta submitted">
+      <?php print $user_picture; ?>
+      <?php
+        print t('published by !username on !datetime',
+          array('!username' => $name, '!datetime' => $date));
+      ?>
+    </div>
   <?php endif; ?>
 
-  <div class="content">
-    <?php print $content ?>
+  <div class="content clearfix" <?php print $content_attributes; ?>>
+    <?php
+    hide($content['comments']);
+    hide($content['links']);
+    print render($content); ?>
   </div>
 
-  <?php if ($links||$taxonomy){ ?>
-    <div class="meta">
-
-      <?php if ($links): ?>
-        <div class="links">
-          <?php print $links; ?>
-        </div>
-      <?php endif; ?>
-
-      <?php if ($taxonomy): ?>
-        <div class="terms">
-          <?php print $terms ?>
-        </div>
-      <?php endif;?>
-
-      <span class="clear"></span>
-
+  <?php
+    // Remove the "Add new comment" link on the teaser page or if the comment
+    // form is being displayed on the same page.
+    if ($teaser || !empty($content['comments']['comment_form'])) {
+      unset($content['links']['comment']['#links']['comment-add']);
+    }
+    // Only display the wrapper div if there are links.
+    $links = render($content['links']);
+    if ($links):
+  ?>
+    <div class="link-wrapper">
+      <?php print $links; ?>
     </div>
-  <?php }?>
+  <?php endif; ?>
+
+  <?php print render($content['comments']); ?>
 
 </div>
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/framework/page.tpl.php,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 page.tpl.php
--- page.tpl.php	28 Nov 2008 06:14:30 -0000	1.1.6.2
+++ page.tpl.php	26 Nov 2010 04:34:32 -0000
@@ -1,87 +1,71 @@
-<?php
-// $Id: page.tpl.php,v 1.1.6.2 2008/11/28 06:14:30 andregriffin Exp $
-?><!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 ?>">
-  <head>
-    <title><?php print $head_title ?></title>
-    <?php print $head ?>
-    <?php print $styles ?>
-    <?php print $scripts ?>
-    <!--[if lte IE 7]><?php print phptemplate_get_ie_styles(); ?><![endif]--><!--If Less Than or Equal (lte) to IE 7-->
-  </head>
-  <body<?php print phptemplate_body_class($left, $right); ?>>
-
+<?php if (isset($page_top)): print $page_top; endif;?>
 <!-- Layout -->
-    <div id="wrapper">
-      <div id="header">
-        <?php print $header; ?>
-
-        <?php if ($logo): ?>
-          <a href="<?php print check_url($front_page); ?>" title="<?php print check_plain($site_name); ?>">
-            <img src="<?php print check_url($logo); ?>" alt="<?php print check_plain($site_name); ?>" id="logo" />
-          </a>
-        <?php endif; ?>
-        <?php print '<h1><a href="'. check_url($front_page) .'" title="'. check_plain($site_name) .'">';
-          if ($site_name) {
-            print '<span id="sitename">'. check_plain($site_name) .'</span>';
-          }
-          if ($site_slogan) {
-            print '<span id="siteslogan">'. check_plain($site_slogan) .'</span>';
-          }
-          print '</a></h1>';
-        ?>
-
-        <?php if ($search_box): ?><?php print $search_box ?><?php endif; ?>
-        <div class="clear"></div>
-      </div> <!-- /#header -->
-
-      <div id="nav">
-        <?php if (isset($primary_links)) : ?>
-          <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
-        <?php endif; ?>
-        <?php if (isset($secondary_links)) : ?>
-          <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')) ?>
-        <?php endif; ?>
-      </div> <!-- /#nav -->
-
-      <div id="container">
-
-        <?php if ($left): ?>
-          <div id="sidebar-left" class="sidebar">
-            <?php print $left ?>
-          </div> <!-- /#sidebar-left -->
-        <?php endif; ?>
-
-        <div id="center">
-          <?php print $breadcrumb; ?>
-          <?php if ($mission): print '<div id="mission">'. $mission .'</div>'; endif; ?>
-          <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
-          <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
-          <?php if ($tabs): print '<ul class="tabs primary">'. $tabs .'</ul></div>'; endif; ?>
-          <?php if ($tabs2): print '<ul class="tabs secondary">'. $tabs2 .'</ul>'; endif; ?>
-          <?php if ($show_messages && $messages): print $messages; endif; ?>
-          <?php print $help; ?>
-          <?php print $content ?>
-        </div> <!-- /#center -->
-  
-        <?php if ($right): ?>
-          <div id="sidebar-right" class="sidebar">
-            <?php print $right ?>
-          </div> <!-- /#sidebar-right -->
-        <?php endif; ?>
-
-        <div id="footer" class="clear">
-          <?php print $footer_message . $footer ?>
-          <?php print $feed_icons ?>
-        </div> <!-- /#footer -->
-
-      </div> <!-- /#container -->
-      <span class="clear"></span>
-    </div> <!-- /#wrapper -->
+<div id="wrapper">
+  <div id="header">
+    <?php print render($page['header']); ?>
+
+    <?php if ($logo): ?>
+      <a href="<?php print check_url($front_page); ?>" title="<?php print check_plain($site_name); ?>">
+        <img src="<?php print check_url($logo); ?>" alt="<?php print check_plain($site_name); ?>" id="logo" />
+      </a>
+    <?php endif; ?>
+    <?php print '<h1><a href="'. check_url($front_page) .'" title="'. check_plain($site_name) .'">';
+      if ($site_name) {
+        print '<span id="sitename">'. check_plain($site_name) .'</span>';
+      }
+      if ($site_slogan) {
+        print '<span id="siteslogan">'. check_plain($site_slogan) .'</span>';
+      }
+      print '</a></h1>';
+    ?>
+
+    <div class="clear"></div>
+  </div> <!-- /#header -->
+
+  <div id="nav">
+    <?php if (!empty($main_menu)) : ?>
+      <?php print theme('links', array('links' => $main_menu, 'attributes' => array('id' => 'primary', 'class' => array('links', 'clearfix', 'main-menu')))); ?>
+    <?php endif; ?>
+    <?php if (!empty($secondary_menu)) : ?>
+      <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary', 'class' => array('links', 'clearfix', 'sub-menu')))); ?>
+    <?php endif; ?>
+  </div> <!-- /#nav -->
+
+  <div id="container">
+
+    <?php if ($page['sidebar_first']): ?>
+      <div id="sidebar-left" class="sidebar">
+        <?php print render($page['sidebar_first']) ?>
+      </div> <!-- /#sidebar-left -->
+    <?php endif; ?>
+
+    <div id="center">
+      <?php print $breadcrumb; ?>
+      <?php if (!empty($page['highlight'])): print '<div id="mission">'. render($page['highlight']) .'</div>'; endif; ?>
+      <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
+      <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
+      <?php if ($tabs): print '<ul class="tabs primary">'. render($tabs) .'</ul></div>'; endif; ?>
+      <?php if (isset($tabs2)): print '<ul class="tabs secondary">'. $tabs2 .'</ul>'; endif; ?>
+      <?php if ($show_messages && $messages): print $messages; endif; ?>
+      <?php if (!empty($page['help'])): print render($page['help']); endif; ?>
+      <?php print render($page['content']) ?>
+    </div> <!-- /#center -->
+
+    <?php if ($page['sidebar_second']): ?>
+      <div id="sidebar-right" class="sidebar">
+        <?php print render($page['sidebar_second']) ?>
+      </div> <!-- /#sidebar-right -->
+    <?php endif; ?>
+
+    <div id="footer" class="clear">
+      <?php print render($page['footer']) ?>
+      <?php print $feed_icons ?>
+    </div> <!-- /#footer -->
+
+  </div> <!-- /#container -->
+  <span class="clear"></span>
+</div> <!-- /#wrapper -->
 <!-- /layout -->
 
-  <?php print $closure ?>
+<?php if (isset($page_bottom)): print $page_bottom; endif;?>
 
-  </body>
-</html>
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/framework/template.php,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 template.php
--- template.php	28 Nov 2008 06:14:30 -0000	1.1.6.2
+++ template.php	26 Nov 2010 04:34:32 -0000
@@ -7,14 +7,14 @@
  * Adds 'sidebar-left', 'sidebar-right' or 'sidebars' classes as needed.
  */
 function phptemplate_body_class($left, $right) {
-  if ($left != '' && $right != '') {
+  if (!empty($left) && !empty($right)) {
     $class = 'sidebars';
   }
   else {
-    if ($left != '') {
+    if (!empty($left)) {
       $class = 'sidebar-left';
     }
-    if ($right != '') {
+    if (!empty($right)) {
       $class = 'sidebar-right';
     }
   }