[ljcom] r10659: LJSUP-9117: S2 Expand

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

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-06-17 07:58:23 UTC (rev 10658)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-06-17 09:32:29 UTC (rev 10659)
@@ -1529,7 +1529,9 @@
     if ($c.parent_url != "") { print safe """(<a href="$c.parent_url">$*text_comment_parent</a>) """; }
     if (($c.thread_url != "") and (not $c.spam)) {
         print safe """(<a href="$c.thread_url">$*text_comment_thread</a>) """;
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "") {
+            "("; $c->print_expand_collapse_links(); ") ";
+        }
     }
     """</div><div class="hr"><hr /></div>""";
 }
@@ -1542,6 +1544,6 @@
     }
     print safe """<a href="$c.permalink_url">$subj</a> <span class="emdash">—</span> $poster""";
     if ($c.thread_url != "") {
-        $c->print_expand_collapse_links();
+        " ("; $c->print_expand_collapse_links(); ") ";
     }
 }