[ljcom] r11354: LJSUP-10959: Add "View classic comments"...

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

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2012-01-26 13:11:43 UTC (rev 11353)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2012-01-26 13:11:59 UTC (rev 11354)
@@ -1028,6 +1028,11 @@
                         <div class="entry-text"><div class="entry-comments-text">
 """;
         "<a name='comments'></a>";
+
+        if ($*old_s1 and $.comment_pages.total_subitems > 0) {
+            """<div class="comments-pages">""";$.comment_pages->print();"""</div>""";
+        }
+
         var string comments_showspam = "";
         if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
             if ($p.showspam) {
@@ -1061,9 +1066,10 @@
 
         $this->print_reply_container({ "target" => "topcomment" });
         if ($.comment_pages.total_subitems > 0) {
-            """<div class="comments-pages">""";$.comment_pages->print();"""</div>""";
+            if (not $*old_s1) {"""<div class="comments-pages">""";$.comment_pages->print();"""</div>""";}
             $this->print_multiform_start();
             $this->print_comments($.comments);
+            """<div class="comments-footer">""";
             """<div class="comments-links">( $comments_count $comments_showspam""";
             if (not $.entry.comments.locked) { 
             """<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" }); """</span>""";
@@ -1073,6 +1079,7 @@
             if ($.comment_pages.all_subitems_displayed) { """<div class="hr"><hr /></div>"""; }
             $this->print_multiform_actionline();
             $this->print_multiform_end();
+            """</div>""";
             """<div class="comments-pages">""";$.comment_pages->print();"""</div>""";
         }