#382870 by geerlingguy, jmburnz, EclipseGc, JohnAlbin, sun, et al: Update and Polish default node.tpl.php output.

3 files changed, 21 insertions, 14 deletions

diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index d76e37224..935d62730 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -1,34 +1,39 @@
 <?php
 // $Id$
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?>">
+<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>">
 
-<?php print $picture ?>
-<?php if ($page == 0): ?>
-  <h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
+  <?php print $user_picture; ?>
+
+  <?php if (!$page): ?>
+    <h2><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; ?>
 
   <div class="content clearfix">
-    <?php hide($content['links']); hide($content['comments']); print render($content); ?>
+    <?php
+      // We hide the comments and links now so that we can render them later.
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?>
   </div>
 
   <div class="clearfix">
-    <div class="meta">
     <?php if (!empty($content['links']['terms'])): ?>
-      <div class="terms"><?php print render($content['links']['terms']) ?></div>
-    <?php endif;?>
-    </div>
+      <div class="meta">
+        <div class="terms"><?php print render($content['links']['terms']); ?></div>
+      </div>
+    <?php endif; ?>
 
     <?php if (!empty($content['links'])): ?>
-      <div class="links"><?php print render($content['links']) ?></div>
+      <div class="links"><?php print render($content['links']); ?></div>
     <?php endif; ?>
 
     <?php print render($content['comments']); ?>
-
   </div>
 
 </div>
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 5f9c1b308..71fb9be81 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -206,7 +206,8 @@ ul.links li, ul.inline li {
   padding-left: 0;
 }
 
-.picture, .comment .submitted {
+.user-picture,
+.comment .submitted {
   padding-left: 0;
   float: left;
   clear: left;
diff --git a/themes/garland/style.css b/themes/garland/style.css
index c72a341a5..4f277451f 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -674,7 +674,8 @@ ul.links li, ul.inline li {
   padding-left: 1em;
 }
 
-.picture, .comment .submitted {
+.user-picture,
+.comment .submitted {
   float: right; /* LTR */
   clear: right; /* LTR */
   padding-left: 1em; /* LTR */