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

U   trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/nebula/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-11-28 12:14:32 UTC (rev 11217)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-11-28 12:24:11 UTC (rev 11218)
@@ -1175,10 +1175,6 @@
                 ### showing reply link if comment not screened
                 $c->print_reply_link({ "linktext" => $*text_comment_reply });
             }
-    
-            ###"<a href='$c.reply_url'>Reply</a>";
-            #$c->print_reply_link({"linktext" => $*text_comment_reply});
-    
         }
     }
     if ($c.parent_url != "") { " &middot; <a href='$c.parent_url'>Parent</a>"; }

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-11-28 12:14:32 UTC (rev 11217)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-11-28 12:24:11 UTC (rev 11218)
@@ -2369,7 +2369,6 @@
     if ($comment.thread_url != "" and (not $comment.spam))
     {
         """(<a href="$comment.thread_url">$*text_comment_thread</a>) """;
-        var Link expand_link = $comment->get_link("expand_comments");
         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-11-28 12:14:32 UTC (rev 11217)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-11-28 12:24:11 UTC (rev 11218)
@@ -1716,10 +1716,6 @@
     }
     if (($c.thread_url != "") and (not $c.spam)) {
         print safe "(<a href='$c.thread_url'>$*text_comment_thread</a>) ";
-        # var Link expand_link = $c->get_link("expand_comments");
-        # if (defined $expand_link) {
-        #     println "(" + $c->expand_link() + ") ";
-        # }
         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-11-28 12:14:32 UTC (rev 11217)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-11-28 12:24:11 UTC (rev 11218)
@@ -2412,47 +2412,6 @@
     var string indent = ($e.depth - 1) * 25 + "px";
     var string id     = $e.dom_id ? " id=\"$e.dom_id\"" : "";
 
-#     if ((not $e.full) or ($e.full and $e.spam and not $p.showspam)) {
-#         # Collapsed mode
-# 
-#         """
-#         <a name='$e.anchor'></a>
-#         <div $id style="margin-left: $indent">
-#           <div class="collapsed-comment comment-inner">
-#             <div class="comment-meta">""";
-# 
-#         var string subject = $e.subject != "" ? $e.subject : """<i class="nosubject">$*text_nosubject</i>""";
-#         
-#         if ($e.spam and not $p.showspam) {
-#             print safe """<strong>$*text_spam_comment</strong> <span class="separator">-</span> """;
-#         } else {
-#              print safe """<a href="$e.permalink_url" class="collapsed-comment-link">$subject</a> <span class="separator">-</span> """;
-#         }
-# 
-#         var string poster = (defined $e.poster ? ""+$e.poster : """<i class="noposter">$*text_poster_anonymous</i>""");
-#         print safe """$poster <span class="separator">-</span> """;
-#         print lang_posted_by_date_and_time($e, false, true, true);
-# 
-#         var Link expand_link = $e->get_link("expand_comments");
-#         if ($e.thread_url != "" and defined $expand_link) {
-# 	      " " + $e->expand_link({ "class" => "collapsed-comment-link" });
-#         }
-# 
-#         """
-#             </div>
-#           </div>
-#         </div>\n""";
-# 
-#         if (size($e.replies) > 0) {
-#             foreach var Comment c ($e.replies) {
-#                 $this->print_comment($c);
-#             }
-#         }
-# 
-# 
-#         return;
-#     }
-
     """<a name='$e.anchor'></a>
        <div$id style="margin-left: $indent;$screenbarc">
        <div class="comment-inner $barc comment">
@@ -2509,10 +2468,6 @@
     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>""";
-        #var Link expand_link = $e->get_link("expand_comments");
-        #if (defined $expand_link) {
-        #    " $sep " + $e->expand_link();
-        #}
         if ($e.parent_url != "") {
             $e->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"});
         }