[ljcom] r10369: LJSUP-7813: 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-11 09:15:21 UTC (rev 10368)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-11 09:53:28 UTC (rev 10369)
@@ -2354,7 +2354,7 @@
 
         var Link expand_link = $e->get_link("expand_comments");
         if ($e.thread_url != "" and defined $expand_link) {
-            " " + $e->expand_link({ "class" => "collapsed-comment-link" });
+	    $e->print_expand_collapse_links();
         }
 
         """
@@ -2428,10 +2428,7 @@
     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>""";
-        var Link expand_link = $e->get_link("expand_comments");
-        if (defined $expand_link) {
-            " $sep " + $e->expand_link();
-        }
+        $e->print_expand_collapse_links();
     }
 
     $e->print_linkbar();