Максим Червонный (fiskus_boulder) wrote in changelog,
Максим Червонный
fiskus_boulder
changelog

[livejournal] r20015: LJSUP-9730: there is no Collapse link in...

Committer: mchervonniy
LJSUP-9730: there is no Collapse link in last comment in thread
U   trunk/bin/upgrading/s2layers/classic/layout.s2
U   trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2
U   trunk/bin/upgrading/s2layers/generator/layout.s2
U   trunk/bin/upgrading/s2layers/magazine/layout.s2
U   trunk/bin/upgrading/s2layers/punquin/layout.s2
U   trunk/bin/upgrading/s2layers/sixhtml/layout.s2
U   trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
U   trunk/bin/upgrading/s2layers/tabularindent/layout.s2
Modified: trunk/bin/upgrading/s2layers/classic/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/classic/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/classic/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -1072,7 +1072,7 @@
     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>) ";
-        if ($c.parent_url != "" and size $c.replies > 0) {
+        if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>"(%_)", "collapse"=>"(%_)"});
         }
     }

Modified: trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -1371,7 +1371,7 @@
     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>) """;
-        if ($c.parent_url != "" and size $c.replies > 0) {
+        if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "});
         }
     }

Modified: trunk/bin/upgrading/s2layers/generator/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/generator/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/generator/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -1441,7 +1441,7 @@
     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>) ";
-        if ($c.parent_url != "" and size $c.replies > 0) {
+        if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>"(%_)", "collapse"=>"(%_)"});
         }
     }

Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -1052,7 +1052,7 @@
     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>) ";
-        if ($c.parent_url != "" and size $c.replies > 0) {
+        if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "});
         }
     }

Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -988,7 +988,7 @@
 #          # if (defined $expand_link) {
 #          #     "(" + $c->expand_link() + ") ";
 #          # }
-         if ($c.parent_url != "" and size $c.replies > 0) {
+         if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "});
         }
     }

Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -1106,7 +1106,7 @@
      if ($e.parent_url) { print " $sep <a href='$e.parent_url'>$*text_comment_parent</a>"; }
      if (($e.thread_url != "") and (not $e.spam)) {
          print " $sep <a href='$e.thread_url'>$*text_comment_thread</a>";
-         if ($e.parent_url != "" and size $e.replies > 0) {
+         if ($e.parent_url != "") {
             $e->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"});
         }
      }

Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -868,7 +868,7 @@
     if ($c.parent_url != "") { """<a href="$c.parent_url">$*text_comment_parent</a> - """; }
     if ($c.thread_url != "" and (not $c.spam)) {
         """<a href="$c.thread_url">$*text_comment_thread</a> """;
-        if ($c.parent_url != "" and size $c.replies > 0) {
+        if ($c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"});
         }
 	""" - """;

Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-09-12 04:45:02 UTC (rev 20014)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-09-12 06:22:23 UTC (rev 20015)
@@ -570,7 +570,7 @@
             
             ") ";
         }
-        if ($c.thread_url != "" and (not $c.spam) and $c.parent_url != "" and size $c.replies > 0) {
+        if ($c.thread_url != "" and (not $c.spam) and $c.parent_url != "") {
             $c->print_expand_collapse_links({ "expand"=>" (%_) ", "collapse"=>" (%_) "});
         }
 

Tags: fiskus_boulder, livejournal, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments