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

LJSUP-8551: new thread expander

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

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-12 07:56:47 UTC (rev 10377)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-12 08:04:27 UTC (rev 10378)
@@ -2337,16 +2337,21 @@
         """
         <a name='$e.anchor'></a>
         <div $id style="margin-left: $indent">
+	""";
+        if ($e.screened and not $e.full and not viewer_is_owner()) {
+            """<div class="collapsed-comment comment-inner"><strong>$*text_comment_screened</strong></div>""";
+        } elseif ($e.deleted) {
+            """<div class="collapsed-comment comment-inner"><strong>$*text_comment_deleted</strong></div>""";
+        } elseif ($e.spam and not $p.showspam) {
+            print safe """<div class="collapsed-comment comment-inner"><strong>$*text_spam_comment</strong></div>""";
+        } else {
+	"""
           <div class="collapsed-comment comment-inner">
             <div class="comment-meta">""";
 
         var string subject = $e.subject != "" ? $e.subject : """<i class="nosubject">$*text_nosubject</i>""";
         
-        if ($e.spam and not $p.showspam) {
-            print safe """<strong>$*text_spam_comment</strong> <span class="separator">-</span> """;
-        } else {
              print safe """<a href="$e.permalink_url" class="collapsed-comment-link">$subject</a> <span class="separator">-</span> """;
-        }
 
         var string poster = (defined $e.poster ? ""+$e.poster : """<i class="noposter">$*text_poster_anonymous</i>""");
         print safe """$poster <span class="separator">-</span> """;
@@ -2359,8 +2364,9 @@
 
         """
             </div>
-          </div>
-        </div>\n""";
+          </div>""";
+	}
+	"""</div>\n""";
 
         if (size($e.replies) > 0) {
             foreach var Comment c ($e.replies) {