1 files changed, 23 insertions, 9 deletions
diff --git a/themes/engines/phptemplate/node.tpl.php b/themes/engines/phptemplate/node.tpl.php
index 6da685329..872ea0c29 100644
--- a/themes/engines/phptemplate/node.tpl.php
+++ b/themes/engines/phptemplate/node.tpl.php
@@ -1,15 +1,29 @@
-<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?> clear-block">
-  <?php if ($page == 0): ?>
-    <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clear-block">
+
+<?php print $picture ?>
+
+<?php if ($page == 0): ?>
+  <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+<?php endif; ?>
+
+  <div class="meta">
+  <?php if ($submitted): ?>
+    <span class="submitted"><?php print $submitted ?></span>
   <?php endif; ?>
-  <?php print $picture ?>
 
-  <div class="info"><?php print $submitted ?><span class="terms"><?php print $terms ?></span></div>
+  <?php if ($terms): ?>
+    <span class="terms"><?php print $terms ?></span>
+  <?php endif;?>
+  </div>
+
   <div class="content">
     <?php print $content ?>
   </div>
 
-  <?php if ($links): ?>
-  <div class="links"><?php print $links ?></div>
-  <?php endif; ?>
-</div>
+<?php
+  if ($links) {
+    print $links;
+  }
+?>
+
+</div>
+\ No newline at end of file