[ljcom] r10812: LJSUP-9404: S2 Anchors

U   trunk/bin/upgrading/s2layers/3column/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-08-08 09:46:01 UTC (rev 10811)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-08-09 03:16:22 UTC (rev 10812)
@@ -493,7 +493,7 @@
 
     if ($.entry.comments.count > 0) {
     """
-    <h3>Comments</h3>
+    <h3 id="$*text_comments_id">Comments</h3>
     """;
     }
 
@@ -822,7 +822,7 @@
         if ($p.showspam) {
             $comments_showspam = "";
         } else {
-            $comments_showspam = """<a href="$e.comments.read_spam_url">$e.comments.spam_counter<img src="$*SITEROOT/img/style/3column/spam.gif" alt=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" title=\"""" + 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">$e.comments.spam_counter<img src="$*SITEROOT/img/style/3column/spam.gif" alt=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" /></a>""";
         }
     } else {
         $comments_showspam = "";
@@ -877,18 +877,18 @@
     var Page p = get_page();
     if ($p.view == "entry") {
 if (not $.locked) {
-    $p->print_reply_link({"target" => "topcomment", "img_url" => $*i_leave});
+    $p->print_reply_link({"target" => "topcomment", "img_url" => $*i_leave, "reply_url" => $.post_url+"#$*text_addcomment_id"});
 }
      } else {
 if (not $.locked) {
-    print safe """<a href="$.post_url" title="$*t_post_comment"><img src="$*i_leave" border="0" title="$*t_post_comment" alt="$*t_post_comment" /></a> $*t_divider """;
+    print safe """<a href="$.post_url#$*text_addcomment_id" title="$*t_post_comment"><img src="$*i_leave" border="0" title="$*t_post_comment" alt="$*t_post_comment" /></a> $*t_divider """;
 }
     }
 }
 
 function CommentInfo::print_readlink {
     var Page p = get_page();
-    print safe "<a href=\"$.read_url\" title=\"$*t_read_comments\">"+
+    print safe "<a href=\"$.read_url#$*text_comments_id\" title=\"$*t_read_comments\">"+
         get_plural_phrase($.count, $p.view == "friends" ?
                           "t_read_comments_friends" : "t_read_comments")+
     "<img src=\"$*i_comment\" border=\"0\" title=\"$*text_reply_back\" alt=\" $*text_reply_back\" /></a>$*t_divider";
@@ -964,7 +964,7 @@
     "</div>";
     }
     print_ebox($.entry);
-    """<div class="replyform">
+    """<div id="$*text_addcomment_id" class="replyform">
     """;
     $.form->print();
     """