Committer: esavintcev
LJSUP-9404: AnchorsU trunk/bin/upgrading/s2layers/sup/themes.s2
Modified: trunk/bin/upgrading/s2layers/sup/themes.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/themes.s2 2011-08-17 03:08:26 UTC (rev 10871) +++ trunk/bin/upgrading/s2layers/sup/themes.s2 2011-08-17 03:23:31 UTC (rev 10872) @@ -207,14 +207,14 @@ function CommentInfo::print() { var Page p = get_page(); if ($.show_readlink) { - """<li class="comments"><a href="$.read_url" class="btn btn-comments"><span><span><span>$.count</span></span></span></a></li>"""; + """<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span><span><span>$.count</span></span></span></a></li>"""; } if ($.show_postlink) { """<li class="postcomment">"""; if ($.maxcomments) { print safe """<span class="btn btn-comment"><span><span><span>$*text_max_comments</span></span></span></span>"""; } else { - """<a href="$.post_url" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>"; + """<a href="$.post_url#$*text_addcomment_id" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>"; } "</li>"; } @@ -441,14 +441,14 @@ function CommentInfo::print() { var Page p = get_page(); if ($.show_readlink) { - """<li class="comments"><a href="$.read_url">$.count</a></li>"""; + """<li class="comments"><a href="$.read_url#$*text_comments_id">$.count</a></li>"""; } if ($.show_postlink) { """<li class="postcomment">"""; if ($.maxcomments) { print safe """$*text_max_comments"""; } else { - """<a href="$.post_url">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>"; + """<a href="$.post_url#$*text_addcomment_id">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>"; } "</li>"; } @@ -493,14 +493,14 @@ var Page p = get_page(); var string text_count = get_plural_phrase($.count,"text_read_comments"); if ($.show_readlink) { - """<li class="comments"><a href="$.read_url" class="btn btn-comments"><span>$text_count</span></a></li>"""; + """<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span>$text_count</span></a></li>"""; } if ($.show_postlink) { """<li class="postcomment">"""; if ($.maxcomments) { print safe """<span class="btn btn-comment"><span><span><span>$*text_max_comments</span></span></span></span>"""; } else { - """<a href="$.post_url" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>"; + """<a href="$.post_url#$*text_addcomment_id" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>"; } "</li>"; } @@ -772,7 +772,7 @@ if ($p.showspam) { $comments_showspam = """<br /><span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>"""; } else { - $comments_showspam = """<br /><span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>"""; + $comments_showspam = """<br /><span class="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></span>"""; } } else { $comments_showspam = ""; @@ -786,7 +786,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -805,7 +805,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1134,7 +1134,7 @@ if ($p.showspam) { $comments_showspam = """<br /><span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>"""; } else { - $comments_showspam = """<br /><span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>"""; + $comments_showspam = """<br /><span class="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></span>"""; } } else { $comments_showspam = ""; @@ -1148,7 +1148,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1167,7 +1167,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1496,7 +1496,7 @@ if ($p.showspam) { $comments_showspam = """<br /><span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>"""; } else { - $comments_showspam = """<br /><span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>"""; + $comments_showspam = """<br /><span class="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></span>"""; } } else { $comments_showspam = ""; @@ -1510,7 +1510,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1529,7 +1529,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1858,7 +1858,7 @@ if ($p.showspam) { $comments_showspam = """<br /><span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>"""; } else { - $comments_showspam = """<br /><span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>"""; + $comments_showspam = """<br /><span class="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></span>"""; } } else { $comments_showspam = ""; @@ -1872,7 +1872,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div> @@ -1891,7 +1891,7 @@ if (not $.entry.comments.locked) { """ <div class="comments-reply"> - <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment" });"""</p> + <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p> """; """ </div>