Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.10
diff -u -p -r1.10 node.tpl.php
--- modules/node/node.tpl.php	18 Feb 2009 14:28:22 -0000	1.10
+++ modules/node/node.tpl.php	16 Mar 2009 04:57:38 -0000
@@ -49,30 +49,37 @@
  * @see template_preprocess_node()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clearfix">
+<div id="node-<?php print $node->nid; ?>" class="node node-<?php print $node->type; ?> <?php print $node->sticky; ?> <?php print $node->status; ?> clearfix">
+<!-- The above classes will hopefully be replaced by a $node_classes variable: see - http://drupal.org/node/306358 -->
 
-<?php print $picture ?>
-
-<?php if (!$page): ?>
-  <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
+  <?php if ($picture): ?>
+    <div class="user-picture"><?php print $picture ?></div>
+  <?php endif; ?>
 
-  <div class="meta">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted ?></span>
+  <?php if (!$page): ?>
+    <div class="title">
+      <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+    </div>
   <?php endif; ?>
 
-  <?php if ($terms): ?>
-    <div class="terms terms-inline"><?php print $terms ?></div>
-  <?php endif;?>
+  <div class="meta">
+    <?php if ($submitted): ?>
+      <span class="submitted"><?php print $submitted ?></span>
+    <?php endif; ?>
+
+    <?php if ($terms): ?>
+      <div class="terms"><?php print $terms ?></div>
+    <?php endif;?>
   </div>
 
   <div class="content">
     <?php print $content ?>
   </div>
 
-  <?php print $links; ?>
-
+  <div class="links">
+    <?php print $links; ?>
+  </div>
+  
   <?php print $comments; ?>
 
 </div>
\ No newline at end of file