[livejournal] r19321: LJSUP-9117: S2 Expand

U   trunk/bin/upgrading/s2layers/classic/layout.s2
U   trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2
U   trunk/bin/upgrading/s2layers/magazine/layout.s2

Modified: trunk/bin/upgrading/s2layers/classic/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/classic/layout.s2	2011-06-20 06:35:31 UTC (rev 19320)
+++ trunk/bin/upgrading/s2layers/classic/layout.s2	2011-06-20 06:54:34 UTC (rev 19321)
@@ -982,7 +982,7 @@
     var string subj = $c.subject != "" ? $c.subject : $*text_nosubject;
     print safe "<a href='$c.permalink_url'>$subj</a> - $poster";
     if ($c.thread_url != "") {
-        $c->print_expand_collapse_links();
+        " ("; $c->print_expand_collapse_links(); ")";
     }
 }
 
@@ -1073,7 +1073,9 @@
     if ($c.parent_url != "") { "(<a href='$c.parent_url'>Parent</a>) "; }
     if ($c.thread_url != "" and $c.spam == false) {
         "(<a href='$c.thread_url'>Thread</a>) ";
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "" and size $c.replies > 0) {
+            "("; $c->print_expand_collapse_links(); ")";
+        }
     }
 
     if (not $c.frozen) {

Modified: trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-06-20 06:35:31 UTC (rev 19320)
+++ trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-06-20 06:54:34 UTC (rev 19321)
@@ -1371,7 +1371,9 @@
     if ($c.parent_url != "") { println """(<a href="$c.parent_url">Parent</a>) """; }
     if ($c.thread_url != "" and (not $c.spam)) {
         println """(<a href="$c.thread_url">Thread</a>) """;
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "" and size $c.replies > 0) {
+            "("; $c->print_expand_collapse_links(); ")";
+        }
     }
     if (not $c.frozen) {
         $c->print_reply_container({"class" => "quickreply"});
@@ -1384,7 +1386,7 @@
     var string subj = $c.subject != "" ? $c.subject : $*text_nosubject;
     print safe "<a href='$c.permalink_url'>$subj</a> - $poster";
     if ($c.thread_url) {
-        $c->print_expand_collapse_links();
+        " ("; $c->print_expand_collapse_links(); ")";
     }
 }
 

Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-06-20 06:35:31 UTC (rev 19320)
+++ trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-06-20 06:54:34 UTC (rev 19321)
@@ -955,7 +955,7 @@
     var string subj = $c.subject != "" ? $c.subject : $*text_nosubject;
     print safe "<a href='$c.permalink_url'>$subj</a> - $poster";
     if ($c.thread_url != "") {
-        $c->print_expand_collapse_links();
+        " ("; $c->print_expand_collapse_links(); ")";
     }
 }
 
@@ -1048,7 +1048,9 @@
     if ($c.parent_url != "") { "(<a href='$c.parent_url'>Parent</a>) "; }
     if (($c.thread_url != "") and (not $c.spam)) {
         "(<a href='$c.thread_url'>Thread</a>) ";
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "" and size $c.replies > 0) {
+            "("; $c->print_expand_collapse_links(); ") ";
+        }
     }
     if (not $c.frozen) {
         $c->print_reply_container({"class" => "quickreply"});