Created
April 27, 2010 12:02
-
-
Save jacobSingh/380664 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 66b01d892293f9e21c45e336d1c3810cadc02521 Mon Sep 17 00:00:00 2001 | |
From: dries <dries> | |
Date: Thu, 8 Apr 2010 18:26:42 +0000 | |
Subject: [PATCH] - Patch #764606 by JohnAlbin: node.tpl no longer needs taxonomy variables. | |
--- | |
modules/node/node.css | 5 +---- | |
modules/node/node.tpl.php | 23 +++++++---------------- | |
themes/garland/node.tpl.php | 8 +------- | |
themes/garland/style-rtl.css | 12 +----------- | |
themes/garland/style.css | 16 ++-------------- | |
5 files changed, 12 insertions(+), 52 deletions(-) | |
diff --git a/modules/node/node.css b/modules/node/node.css | |
index 6c25617..53fcb5f 100644 | |
--- a/modules/node/node.css | |
+++ b/modules/node/node.css | |
@@ -1,4 +1,4 @@ | |
-/* $Id: node.css,v 1.15 2010/03/18 06:50:37 dries Exp $ */ | |
+/* $Id: node.css,v 1.16 2010/04/08 18:26:42 dries Exp $ */ | |
.node-unpublished { | |
background-color: #fff4f4; | |
@@ -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 f438aca..19b5f0c 100644 | |
--- a/modules/node/node.tpl.php | |
+++ b/modules/node/node.tpl.php | |
@@ -1,5 +1,5 @@ | |
<?php | |
-// $Id: node.tpl.php,v 1.32 2010/04/06 16:30:20 dries Exp $ | |
+// $Id: node.tpl.php,v 1.33 2010/04/08 18:26:42 dries Exp $ | |
/** | |
* @file | |
@@ -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 fd99bd5..8c54eee 100644 | |
--- a/themes/garland/node.tpl.php | |
+++ b/themes/garland/node.tpl.php | |
@@ -1,5 +1,5 @@ | |
<?php | |
-// $Id: node.tpl.php,v 1.22 2010/04/06 16:30:20 dries Exp $ | |
+// $Id: node.tpl.php,v 1.23 2010/04/08 18:26:42 dries Exp $ | |
?> | |
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>> | |
@@ -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 53dcab1..9d1e8df 100644 | |
--- a/themes/garland/style-rtl.css | |
+++ b/themes/garland/style-rtl.css | |
@@ -1,4 +1,4 @@ | |
-/* $Id: style-rtl.css,v 1.18 2010/03/03 19:46:26 dries Exp $ */ | |
+/* $Id: style-rtl.css,v 1.19 2010/04/08 18:26:42 dries Exp $ */ | |
html { | |
direction: rtl; | |
@@ -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 a9280c3..4b7c79b 100644 | |
--- a/themes/garland/style.css | |
+++ b/themes/garland/style.css | |
@@ -1,4 +1,4 @@ | |
-/* $Id: style.css,v 1.77 2010/04/01 14:47:16 dries Exp $ */ | |
+/* $Id: style.css,v 1.78 2010/04/08 18:26:42 dries Exp $ */ | |
/** | |
* Generic elements | |
@@ -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; | |
-- | |
1.6.4+GitX |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment