- Patch #130366 by webchick and steven: improved signature handling. Step 1 of 2.

6 files changed, 34 insertions, 3 deletions

diff --git a/themes/bluemarine/comment.tpl.php b/themes/bluemarine/comment.tpl.php
index 02eee299c..810204fc2 100644
--- a/themes/bluemarine/comment.tpl.php
+++ b/themes/bluemarine/comment.tpl.php
@@ -4,6 +4,13 @@
   } ?>
 <h3 class="title"><?php print $title; ?></h3><?php if ($new != '') { ?><span class="new"><?php print $new; ?></span><?php } ?>
     <div class="submitted"><?php print $submitted; ?></div>
-    <div class="content"><?php print $content; ?></div>
+    <div class="content">
+     <?php print $content; ?>
+     <?php if ($signature): ?>
+      <div class="user-signature clear-block">
+       <?php print $signature ?>
+      </div>
+     <?php endif; ?>
+    </div>
     <div class="links">&raquo; <?php print $links; ?></div>
   </div>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index f4b5b702f..c3da58a40 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -163,7 +163,13 @@ function chameleon_comment($comment, $links = "") {
 
   $output  = "<div class=\"comment". ($comment->status == COMMENT_NOT_PUBLISHED ? ' comment-unpublished' : '') ."\">\n";
   $output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") ."</h3>\n";
-  $output .= " <div class=\"content\">". $comment->comment ."</div>\n";
+  $output .= " <div class=\"content\">". $comment->comment;
+  if ($signature) {
+    $output .= "  <div class=\"user-signature clear-block\">";
+    $output .= $signature ."\n";
+    $output .= "  </div>\n";
+  }
+  $output .= " </div>\n";
   $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $links)) ."</div>\n";
   $output .= "</div>\n";
 
diff --git a/themes/engines/phptemplate/comment.tpl.php b/themes/engines/phptemplate/comment.tpl.php
index c7211b9bf..ac4eeb88a 100644
--- a/themes/engines/phptemplate/comment.tpl.php
+++ b/themes/engines/phptemplate/comment.tpl.php
@@ -14,6 +14,11 @@
 
   <div class="content">
     <?php print $content ?>
+    <?php if ($signature): ?>
+    <div class="user-signature clear-block">
+      <?php print $signature ?>
+    </div>
+    <?php endif; ?>
   </div>
 
   <?php print $links ?>
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 329762d8d..acde67a34 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -313,6 +313,7 @@ function phptemplate_comment($comment, $links = 0) {
     'date'      => format_date($comment->timestamp),
     'links'     => isset($links) ? theme('links', $links) : '',
     'new'       => $comment->new ? t('new') : '',
+    'signature' => $comment->signature,
     'picture'   => theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '',
     'submitted' => t('Submitted by !a on @b.',
                       array('!a' => theme('username', $comment),
diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index 30c5ff937..1ca545f12 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -16,6 +16,11 @@
 
     <div class="content">
       <?php print $content ?>
+      <?php if ($signature): ?>
+      <div class="user-signature clear-block">
+        <?php print $signature ?>
+      </div>
+      <?php endif; ?>
     </div>
 
   </div>
diff --git a/themes/pushbutton/comment.tpl.php b/themes/pushbutton/comment.tpl.php
index 2f2113b8e..20949e774 100644
--- a/themes/pushbutton/comment.tpl.php
+++ b/themes/pushbutton/comment.tpl.php
@@ -4,7 +4,14 @@
   <?php endif; ?>
   <h3 class="title"><?php print $title ?></h3>
   <div class="submitted"><?php print $submitted ?><?php if ($comment->new) : ?><span class="new"> *<?php print $new ?></span><?php endif; ?></div>
-  <div class="content"><?php print $content ?></div>
+  <div class="content">
+    <?php print $content ?>
+    <?php if ($signature): ?>
+      <div class="user-signature clear-block">
+        <?php print $signature ?>
+      </div>
+    <?php endif; ?>
+  </div>
   <!-- BEGIN: links -->
   <div class="links">&raquo; <?php print $links ?></div>
   <!-- END: links -->