[livejournal] r20630: LJSUP-10206: There is no link to Collaps...

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

Modified: trunk/bin/upgrading/s2layers/lickable/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/lickable/layout.s2	2011-11-25 14:39:55 UTC (rev 20629)
+++ trunk/bin/upgrading/s2layers/lickable/layout.s2	2011-11-25 14:56:46 UTC (rev 20630)
@@ -1166,9 +1166,8 @@
     }
     if ($.thread_url != "") {
         println """<li><a href="$.thread_url">$*text_comment_thread</a></li>""";
-        var Link expand_link = $this->get_link("expand_comments");
-        if (defined $expand_link) {
-            println "<li>" + $this->expand_link() + "</li>";
+        if ($.parent_url != "") {
+            $this->print_expand_collapse_links({ "expand"=>" - %_ ", "collapse"=>" - %_ "}); 
         }
     }
     println """</ul>""";
@@ -1241,9 +1240,8 @@
     else {
         var string subject = ($c.subject ? $c.subject : "<i>(no subject)</i>");
         """<div class="collapsed_entry" id="$c.dom_id"><a href="$c.permalink_url">$subject</a> - $c.poster""";
-        var Link expand_link = $c->get_link("expand_comments");
-        if ($c.thread_url != "" and defined $expand_link) {
-            " " + $c->expand_link();
+        if ($c.parent_url != "") {
+            $c->print_expand_collapse_links({ "expand"=>" - %_ ", "collapse"=>" - %_ "}); 
         }
         """</div>""";
     }