? .DS_Store
? .theme_conditionals.patch.swp
? theme_conditionals.patch
? modules/.DS_Store
? sites/default/files
? sites/default/settings.php
? themes/.DS_Store
Index: themes/bluemarine/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/node.tpl.php,v
retrieving revision 1.7
diff -u -p -r1.7 node.tpl.php
--- themes/bluemarine/node.tpl.php	7 Aug 2007 08:39:36 -0000	1.7
+++ themes/bluemarine/node.tpl.php	14 May 2008 13:41:41 -0000
@@ -1,13 +1,29 @@
 <?php
 // $Id: node.tpl.php,v 1.7 2007/08/07 08:39:36 goba Exp $
 ?>
-  <div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
-    <?php if ($picture) {
-      print $picture;
-    }?>
-    <?php if ($page == 0) { ?><h2 class="title"><a href="<?php print $node_url?>"><?php print $title?></a></h2><?php }; ?>
-    <span class="submitted"><?php print $submitted?></span>
-    <div class="taxonomy"><?php print $terms?></div>
-    <div class="content"><?php print $content?></div>
-    <?php if ($links) { ?><div class="links">&raquo; <?php print $links?></div><?php }; ?>
+
+<div class="node<?php if ($sticky): print " sticky"; endif; ?><?php if (!$status): print " node-unpublished"; endif ?>">
+
+  <?php print $picture ?>
+
+  <?php if ($page == 0): ?>
+    <h2 class="title"><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
+  <?php endif; ?>
+
+  <?php if ($submitted): ?>
+    <span class="submitted"><?php print $submitted ?></span>
+  <?php endif; ?>
+
+  <?php if ($taxonomy): ?>
+    <div class="taxonomy"><?php print $terms ?></div>
+  <?php endif; ?>
+
+  <div class="content">
+    <?php print $content ?>
   </div>
+
+  <?php if ($links): ?>
+    <div class="links">&raquo; <?php print $links?></div>
+  <?php endif; ?>
+
+</div>
Index: themes/pushbutton/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/node.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 node.tpl.php
--- themes/pushbutton/node.tpl.php	7 Aug 2007 08:39:36 -0000	1.4
+++ themes/pushbutton/node.tpl.php	14 May 2008 13:41:41 -0000
@@ -1,15 +1,28 @@
 <?php
 // $Id: node.tpl.php,v 1.4 2007/08/07 08:39:36 goba Exp $
 ?>
-<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
+<div class="node<?php if ($sticky): print " sticky"; endif; ?><?php if (!$status): print " node-unpublished"; endif; ?>">
+
   <?php print $picture ?>
+
   <?php if ($page == 0): ?>
     <h1 class="title"><a href="<?php print $node_url ?>"><?php print $title ?></a></h1>
   <?php endif; ?>
+
+  <?php if ($submitted): ?>
     <span class="submitted"><?php print $submitted ?></span>
+  <?php endif; ?>
+
+  <?php if ($taxonomy): ?>
     <div class="taxonomy"><?php print $terms ?></div>
-    <div class="content"><?php print $content ?></div>
-    <?php if ($links): ?>
+  <?php endif; ?>
+
+  <div class="content">
+    <?php print $content ?>
+  </div>
+
+  <?php if ($links): ?>
     <div class="links">&raquo; <?php print $links ?></div>
-    <?php endif; ?>
+  <?php endif; ?>
+
 </div>