[ljcom] r10818: LJSUP-9404: S2 Anchors

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

Modified: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-08-09 06:57:25 UTC (rev 10817)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-08-09 07:17:59 UTC (rev 10818)
@@ -1183,7 +1183,7 @@
                 $this->print_entry ( $.entry );
                 print_ebox($.entry);
                 if ( $.entry.comments.enabled ) {
-                        print "<div id=\"comments\">";
+                        print "<div id=\"$*text_comments_id\">";
                         print "<h2>Comments {$.entry.comments.count}</h2>";
 
                                 if ( $.comment_pages.total_subitems > 0 ) {
@@ -1207,7 +1207,7 @@
         print "</div>";
         print "<div id=\"footer\" style=\"background: none\">";
 if (not $.entry.comments.locked) {
-        $this->print_reply_link({"target" => "bottomcomment", "linktext" => $*text_post_comment});
+        $this->print_reply_link({"target" => "bottomcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url+"#$*text_addcomment_id"});
 }
         $this->print_reply_container({"target" => "bottomcomment"});
 
@@ -1401,7 +1401,7 @@
                         if ($p.showspam) {
                             $comments_showspam = """ | """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments");
                         } else {
-                            $comments_showspam = """ | <a href="$e.comments.read_spam_url">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
+                            $comments_showspam = """ | <a href="$e.comments.read_spam_url#$*text_comments_id">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
                         }
                     } else {
                         $comments_showspam = "";
@@ -1490,9 +1490,9 @@
                 print safe "$*text_max_comments";
         } else {
            if ($p.view == "entry") {
-                $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment});
+                $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url+"#$*text_addcomment_id"});
            } else {
-                print safe "<a href=\"$.post_url\" title=\"$linktext\" class=\"comments\">$linktext</a>";
+                print safe "<a href=\"$.post_url#$*text_addcomment_id\" title=\"$linktext\" class=\"comments\">$linktext</a>";
            }
         }
 }
@@ -1705,8 +1705,8 @@
                     print "<hr />";
                 }
                 print_ebox($.entry);
-                print "<div class=\"entry-form\">\n";
-                        print "<h2>Reply</h2>\n";
+                print "<div class=\"entry-form\" id=\"$*text_addcomment_id\">\n";
+                        print "<h2>$*text_post_comment</h2>\n";
                         $.form->print();
                 print "</div>";
                 print "</div>";