[ljcom] r10389: LJSUP-8551: changes for Expressive rever...

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-15 06:57:35 UTC (rev 10388)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-15 08:26:30 UTC (rev 10389)
@@ -2337,21 +2337,16 @@
         """
         <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,14 +2354,13 @@
 
         var Link expand_link = $e->get_link("expand_comments");
         if ($e.thread_url != "" and defined $expand_link) {
-	    $e->print_expand_collapse_links();
+	      " " + $e->expand_link({ "class" => "collapsed-comment-link" });
         }
 
         """
             </div>
-          </div>""";
-	}
-	"""</div>\n""";
+          </div>;
+        </div>\n""";
 
         if (size($e.replies) > 0) {
             foreach var Comment c ($e.replies) {
@@ -2434,7 +2428,10 @@
     if ($e.parent_url) { print """ $sep <a href="$e.parent_url">$*text_comment_parent</a>"""; }
     if ($e.thread_url) {
         print """ $sep <a href="$e.thread_url">$*text_comment_thread</a>""";
-        $e->print_expand_collapse_links();
+        var Link expand_link = $e->get_link("expand_comments");
+        if (defined $expand_link) {
+            " $sep " + $e->expand_link();
+        }
     }
 
     $e->print_linkbar();