[ljcom] r10376: LJSUP-8551: new thread expander

U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-12 07:08:29 UTC (rev 10375)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-12 07:51:52 UTC (rev 10376)
@@ -1839,9 +1839,13 @@
 function EntryPage::print_comment(Comment c) {
         var Page p = get_page();
         var int indent = ($c.depth - 1) * 25;
-        if ($c.spam and not $p.showspam) {
-            """<div style='margin-left: ${indent}px;' id="$c.dom_id">\n""";
-            $this->print_comment_partial($c);
+        if ($c.screened and not $c.full and not viewer_is_owner()) {
+            """<div style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_comment_screened</strong></div></div></div>""";
+        } elseif ($c.deleted) {
+            """<div style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_comment_deleted</strong></div></div></div>""";
+	} elseif ($c.spam and not $p.showspam) {
+            """<div style='margin-left: ${indent}px;' id="$c.dom_id"><a name="$c.anchor"></a><div class="commentHolder"><div class="commentText"><strong>$*text_spam_comment</strong></div></div></div>""";
+            
         } elseif ($c.full) {
             """<div style='margin-left: ${indent}px;' id="$c.dom_id" class="ljcmt_full">\n""";
             $this->print_comment_full($c);
@@ -1877,13 +1881,9 @@
     var Page p = get_page();
     """<a name="$comment.anchor"></a>
     <div class="commentHolder"><div class="commentText">""";
-    if ($comment.spam and not $p.showspam) {
-        """<strong>$*text_spam_comment</strong>""";
-    } else {
-        print "<a href=\"$comment.permalink_url\">"+($comment.subject==""?"<i>(no subject)</i>":"$comment.subject")+"</a> - ";
-        print (defined $comment.poster?"<span class=\"ljuser\" style=\"white-space:nowrap;\">$comment.poster</span>":"<i>Anonymous</i>");
-        $comment->print_expand_collapse_links();
-    }
+    print "<a href=\"$comment.permalink_url\">"+($comment.subject==""?"<i>(no subject)</i>":"$comment.subject")+"</a> - ";
+    print (defined $comment.poster?"<span class=\"ljuser\" style=\"white-space:nowrap;\">$comment.poster</span>":"<i>Anonymous</i>");
+    $comment->print_expand_collapse_links();
     """</div></div>""";
 }