[ljcom] r11211: LJSUP-10206: There is no link to Collaps...

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

Modified: trunk/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/opal/layout.s2	2011-11-25 15:14:36 UTC (rev 11210)
+++ trunk/bin/upgrading/s2layers/opal/layout.s2	2011-11-25 15:47:58 UTC (rev 11211)
@@ -1193,16 +1193,11 @@
 
     var string parent;
     var string thread;
-    var string expand = "";
     if($c.parent_url != "") {
         $parent = """<a href="$c.parent_url"> &nbsp; $*text_comment_parent &nbsp; </a>""";
     }
     if($c.thread_url != "") {
         $thread = """<a href="$c.thread_url"> &nbsp; $*text_comment_thread &nbsp; </a>""";
-        var Link expand_link = $c->get_link("expand_comments");
-        if (defined $expand_link)  {
-            $expand = $c->expand_link({ "text" => " &nbsp; $*text_comment_expand &nbsp; " });
-        }
     }
 
     var string subjecticon;
@@ -1279,7 +1274,9 @@
     }
 
     print safe """<a href="$c.permalink_url"> &nbsp; $*text_permalink &nbsp; </a>$parent$thread""";
-    print $expand;
+    if ($c.parent_url != "") {
+        $c->print_expand_collapse_links({ "expand"=>" &nbsp; %_ &nbsp; ", "collapse"=>" &nbsp; %_ &nbsp; "}); 
+    }
     print safe  """</div>""";
     if (not $c.frozen) {
         $c->print_reply_container({"class" => "quickreply"});
@@ -1321,7 +1318,9 @@
                 <a href="$c.permalink_url">$subj</a>
                 $sep $poster
     """;
-    $c->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"});
+    if ($c.parent_url != "") {
+        $c->print_expand_collapse_links({ "expand"=>" &nbsp; %_ &nbsp; ", "collapse"=>" &nbsp; %_ &nbsp; "}); 
+    }
     """</div></div></div>""";
     $this->print_comments($c.replies);
 }