- Patch #764606 by JohnAlbin: node.tpl no longer needs taxonomy variables.

5 files changed, 7 insertions, 47 deletions

diff --git a/modules/node/node.css b/modules/node/node.css
index 073f023f1..07460c85e 100644
--- a/modules/node/node.css
+++ b/modules/node/node.css
@@ -24,6 +24,3 @@
 td.revision-current {
   background: #ffc;
 }
-.terms-inline {
-  display: inline;
-}
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 8867472ec..952f20a9d 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -16,7 +16,6 @@
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
- * - $terms: the themed list of taxonomy term links output from theme_links().
  * - $display_submitted: whether submission information should be displayed.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
@@ -88,20 +87,12 @@
   <?php endif; ?>
   <?php print render($title_suffix); ?>
 
-  <?php if ($display_submitted || !empty($content['links']['terms'])): ?>
-    <div class="meta">
-      <?php if ($display_submitted): ?>
-        <span class="submitted">
-          <?php
-            print t('Submitted by !username on !datetime',
-              array('!username' => $name, '!datetime' => $date));
-          ?>
-        </span>
-      <?php endif; ?>
-
-      <?php if (!empty($content['links']['terms'])): ?>
-        <div class="terms terms-inline"><?php print render($content['links']['terms']); ?></div>
-      <?php endif; ?>
+  <?php if ($display_submitted): ?>
+    <div class="submitted">
+      <?php
+        print t('Submitted by !username on !datetime',
+          array('!username' => $name, '!datetime' => $date));
+      ?>
     </div>
   <?php endif; ?>
 
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 5249188ef..6a7ae448d 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -25,12 +25,6 @@
   </div>
 
   <div class="clearfix">
-    <?php if (!empty($content['links']['terms'])): ?>
-      <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>
     <?php endif; ?>
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 970781a4a..73664aa13 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -200,12 +200,6 @@ ul.links li, ul.inline li {
   text-align: right;
 }
 
-.node .links ul.links li, .comment .links ul.links li {}
-.terms ul.links li {
-  padding-right: 1em;
-  padding-left: 0;
-}
-
 .user-picture,
 .comment .submitted {
   padding-left: 0;
@@ -218,10 +212,6 @@ ul.links li, ul.inline li {
   float: left;
 }
 
-.terms {
-  float: left;
-}
-
 .indented {
   margin-left: 0;
   margin-right: 25px;
diff --git a/themes/garland/style.css b/themes/garland/style.css
index f188c5884..a1fbbe98c 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -234,7 +234,7 @@ span.form-required {
   color: #ffae00;
 }
 
-span.submitted, .description, .vertical-tab-button .summary {
+.submitted, .description, .vertical-tab-button .summary {
   font-size: 0.92em;
   color: #898989;
 }
@@ -723,14 +723,6 @@ ul.links li, ul.inline li {
   text-align: left; /* LTR */
 }
 
-.node .links ul.links li, .comment .links ul.links li {}
-.terms ul.links li {
-  margin-left: 0;
-  margin-right: 0;
-  padding-right: 0;
-  padding-left: 1em;
-}
-
 .user-picture,
 .comment .submitted {
   float: right; /* LTR */
@@ -745,10 +737,6 @@ ul.links li, ul.inline li {
   float: right; /* LTR */
 }
 
-.terms {
-  float: right; /* LTR */
-}
-
 .preview .node, .preview .comment, .node-sticky {
   margin: 0;
   padding: 0.5em 0;