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

[ljcom] r10988: 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/anovelconundrum/layout.s2
U   trunk/bin/upgrading/s2layers/component/layout.s2
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/nebula/layout.s2
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1180,7 +1180,7 @@
     if ($c.parent_url != "") { " &middot; <a href='$c.parent_url'>Parent</a>"; }
     if ($c.thread_url != "" and (not $c.spam)) {
         " &middot; <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"=>" &middot; %_", "collapse"=>" &middot; %_"});
         }
     }

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -2974,7 +2974,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/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -2363,7 +2363,7 @@
     {
         """(<a href="$comment.thread_url">$*text_comment_thread</a>) """;
         var Link expand_link = $comment->get_link("expand_comments");
-        if ($comment.parent_url != "" and size $comment.replies > 0) {
+        if ($comment.parent_url != "") {
             $comment->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "});
         }
     }

Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1718,7 +1718,7 @@
         # if (defined $expand_link) {
         #     println "(" + $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/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1820,7 +1820,7 @@
           if ($.parent_url!="") { print safe """<li><a href="$.parent_url">$*text_comment_parent</a></li>"""; }
           if ($.thread_url!="" and (not $.spam)) {
             print safe """<li><a href="$.thread_url">$*text_comment_thread</a></li>""";
-            if ($.parent_url!="" and size $.replies > 0) {
+            if ($.parent_url!="") {
                 $this->print_expand_collapse_links({ "expand"=>"<li>%_</li>", "collapse"=>"<li>%_</li>"});
             }
           }

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1545,7 +1545,7 @@
     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>) """;
-        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/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1425,7 +1425,7 @@
                 print safe " | ";
             }
             print safe "<a href=\"$c.thread_url\" title=\"$*text_comment_thread\">$*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/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -1490,7 +1490,7 @@
     if ($c.parent_url != "") { println """(<a href="$c.parent_url">$*text_comment_parent</a>) """; }
     if ($c.thread_url != "" and (not $c.spam)) {
         println """(<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/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-09-12 03:42:09 UTC (rev 10987)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-09-12 06:23:14 UTC (rev 10988)
@@ -2524,7 +2524,7 @@
         #if (defined $expand_link) {
         #    " $sep " + $e->expand_link();
         #}
-        if ($e.parent_url != "" and size $e.replies > 0) {
+        if ($e.parent_url != "") {
             $e->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"});
         }
     }

Tags: fiskus_boulder, ljcom, 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