Committer: esavintcev
LJSUP-12463: Double ancors for reply link in journal stylesU trunk/bin/upgrading/s2layers/3column/layout.s2 U trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 U trunk/bin/upgrading/s2layers/boxer/layout.s2 U trunk/bin/upgrading/s2layers/component/layout.s2 U trunk/bin/upgrading/s2layers/cuteness/layout.s2 U trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 U trunk/bin/upgrading/s2layers/gradient/layout.s2 U trunk/bin/upgrading/s2layers/nebula/layout.s2 U trunk/bin/upgrading/s2layers/opal/layout.s2
Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -821,7 +821,7 @@
if ($p.showspam) {
$comments_showspam = "";
} else {
- $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>""";
+ $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>""";
}
} else {
$comments_showspam = "";
@@ -876,18 +876,18 @@
var Page p = get_page();
if ($p.view == "entry") {
if (not $.locked) {
- $p->print_reply_link({"target" => "topcomment", "img_url" => $*i_leave, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "img_url" => $*i_leave, "reply_url" => $.post_url});
}
} else {
if (not $.locked) {
- 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 """;
+ 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 """;
}
}
}
function CommentInfo::print_readlink {
var Page p = get_page();
- print safe "<a href=\"$.read_url#$*text_comments_id\" title=\"$*t_read_comments\">"+
+ print safe "<a href=\"$.read_url\" 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";
Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -752,7 +752,7 @@
} else {
### "<a href=\"$.comments.post_url\">Leave a Comment</a>";
if (not $.comments.locked) {
- $p->print_reply_link({"target" => "bottomcomment", "linktext" => $*text_post_comment, "reply_url" => $.comments.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "bottomcomment", "linktext" => $*text_post_comment, "reply_url" => $.comments.post_url});
}
}
@@ -762,7 +762,7 @@
if ($p.showspam) {
$comments_showspam = get_plural_phrase($.comments.spam_counter, "text_read_spam_comments");
} else {
- $comments_showspam = """ <a href="$.comments.read_spam_url#$*text_comments_id">""" + get_plural_phrase($.comments.spam_counter, "text_read_all_spam_comments") + """</a> """;
+ $comments_showspam = """ <a href="$.comments.read_spam_url">""" + get_plural_phrase($.comments.spam_counter, "text_read_all_spam_comments") + """</a> """;
}
print safe """ · $comments_showspam""";
}
@@ -853,11 +853,11 @@
} else {
if ($p.view == "entry") {
if (not $.locked) {
- $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url});
}
} else {
if (not $.locked) {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+ print safe "<a href=\"$.post_url\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
}
}
}
@@ -1256,7 +1256,7 @@
print safe """<div class="bs">
<img src="$*dingbar_url" alt="$*text_dingbar_alt" />
</div>""";
- "<div style='text-align:center;'><h2><a href='$.entry.comments.read_url#$*text_comments_id'>Read Comments</a></h2></div>";
+ "<div style='text-align:center;'><h2><a href='$.entry.comments.read_url'>Read Comments</a></h2></div>";
print safe """<div class="bs">
<img src="$*dingbar_url" alt="$*text_dingbar_alt" />
</div>""";
Modified: trunk/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/boxer/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/boxer/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -931,7 +931,7 @@
$e.comments->print();
if ($e.comments.enabled) {
"""<span class="icon">""";
- $p->print_reply_link({"target" => "topcomments", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id",
+ $p->print_reply_link({"target" => "topcomments", "reply_url" => $e.comments.post_url,
"img_url" => $*leave_comment, "img_width" => "20",
"img_height" => "21", "img_align" => "middle",
"alt" => "Reply", "title" => "Reply"});
@@ -944,7 +944,7 @@
if ($p.showspam) {
$comments_showspam = """ <span class="icon"><img src="$*SITEROOT/img/btn_unspam.gif" align="middle" border="0" alt="$*text_hidespam" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """\" /></a></span> """;
} else {
- $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url#$*text_comments_id"><img src="$*SITEROOT/img/btn_spam.gif" align="middle" border="0" alt="$*text_showspam" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" /></a></span> """;
+ $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_spam.gif" align="middle" border="0" alt="$*text_showspam" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" /></a></span> """;
}
}
if ($p.view == "entry") {
@@ -1110,7 +1110,7 @@
"""
<br />
- <span class="icon"><a href="$.entry.comments.read_url#$*text_comments_id" class="comments"><img src="$*comment" alt="Comment" title="Comment" width="17" height="21" border="0" align="middle" /></a></span>
+ <span class="icon"><a href="$.entry.comments.read_url" class="comments"><img src="$*comment" alt="Comment" title="Comment" width="17" height="21" border="0" align="middle" /></a></span>
""";
var string{} link_image = {
@@ -1727,7 +1727,7 @@
}
- """<span class="icon"><a href=\"$.read_url#$*text_comments_id\" class="comments">$count<img src="$*comment" alt="Comment" title="Comment" width="17" height="21" border="0" align="middle" /></a></span>""";
+ """<span class="icon"><a href=\"$.read_url\" class="comments">$count<img src="$*comment" alt="Comment" title="Comment" width="17" height="21" border="0" align="middle" /></a></span>""";
}
function CommentInfo::print()
Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/component/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -2239,7 +2239,7 @@
if ($p.showspam) {
$comments_showspam = """ or """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments");
} else {
- $comments_showspam = """ or <a href="$e.comments.read_spam_url#$*text_comments_id">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
+ $comments_showspam = """ or <a href="$e.comments.read_spam_url">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
}
} else {
$comments_showspam = "";
@@ -2267,11 +2267,11 @@
} else {
if ($p.view == "entry") {
if (not $.locked) {
- $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url});
}
} else {
if (not $.locked) {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+ print safe "<a href=\"$.post_url\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
}
}
}
@@ -2640,7 +2640,7 @@
"<b>[$i]</b> ";
} else {
var string url_of = $this->url_of($i);
- """<a href="$url_of#$*text_comments_id" class="link"><b>[$i]</b></a> """;
+ """<a href="$url_of" class="link"><b>[$i]</b></a> """;
}
}
}
Modified: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -1205,7 +1205,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, "reply_url" => $.entry.comments.post_url+"#$*text_addcomment_id"});
+ $this->print_reply_link({"target" => "bottomcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url});
}
$this->print_reply_container({"target" => "bottomcomment"});
@@ -1400,7 +1400,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#$*text_comments_id">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
+ $comments_showspam = """ | <a href="$e.comments.read_spam_url">""" + 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, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url});
} else {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\" title=\"$linktext\" class=\"comments\">$linktext</a>";
+ print safe "<a href=\"$.post_url\" title=\"$linktext\" class=\"comments\">$linktext</a>";
}
}
}
Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -2149,11 +2149,11 @@
var string comments_count = string($.entry.comments.count);
if ($.viewing_thread) {
- var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $.entry.permalink_url) + "#$*text_comments_id";
+ var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $.entry.permalink_url);
$comments_count = """<a href="$toplink">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a>""";
} else {
if ($p.showspam) {
- $comments_count = """<a href="$.entry.permalink_url#$*text_comments_id">""" + get_plural_phrase($.entry.comments.count, "text_read_comments") + """</a>""";
+ $comments_count = """<a href="$.entry.permalink_url">""" + get_plural_phrase($.entry.comments.count, "text_read_comments") + """</a>""";
} else {
$comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
}
@@ -2173,7 +2173,7 @@
if ($p.showspam) {
$comments_showspam = """<span class="comments-hidespam">""" + get_plural_phrase($.entry.comments.spam_counter, "text_read_spam_comments") + """</span> <span class="emdash">—</span> """;
} else {
- $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($.entry.comments.spam_counter, "text_read_all_spam_comments") + """</a></span> <span class="emdash">—</span> """;
+ $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">""" + get_plural_phrase($.entry.comments.spam_counter, "text_read_all_spam_comments") + """</a></span> <span class="emdash">—</span> """;
}
} else {
$comments_showspam = "";
@@ -2189,7 +2189,7 @@
"""
<b>( $comments_count $comments_showspam""";
if (not $.entry.comments.locked) {
- $this->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url+"#$*text_addcomment_id"});
+ $this->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url});
}
""" )</b></center>""";
$this->print_reply_container({"target" => "topcomment"});
@@ -2210,7 +2210,7 @@
<center>
<b>( $comments_count $comments_showspam""";
if (not $.entry.comments.locked) {
- $this->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url+"#$*text_addcomment_id"});
+ $this->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.entry.comments.post_url});
}
""" )</b>""";
$.comment_pages->print();
@@ -2448,9 +2448,9 @@
print safe "$*text_max_comments";
} else {
if ($p.view == "entry") {
- $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url});
} else {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+ print safe "<a href=\"$.post_url\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
}
}
}
Modified: trunk/bin/upgrading/s2layers/gradient/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/gradient/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/gradient/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -1398,7 +1398,7 @@
function CommentInfo::print_readlink() {
var Page p = get_page();
if ($.count > 0 or $.screened) {
- print safe """<a href="$.read_url#$*text_comments_id">""" +
+ print safe """<a href="$.read_url">""" +
get_plural_phrase($.count, $p.view == "friends" ? "text_read_comments_friends" : "text_read_comments") +
"""</a> $*comment_link_divider """;
}
@@ -1409,7 +1409,7 @@
var string linktext = ( $p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment );
var string target = "topcomment";
if (not $.locked) {
- $p->print_reply_link({"target" => $target, "class" => "comments", "title" => "$linktext", "linktext" => $linktext, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => $target, "class" => "comments", "title" => "$linktext", "linktext" => $linktext, "reply_url" => $.post_url});
}
$p->print_reply_container({"target" => $target});
}
@@ -1486,7 +1486,7 @@
if ($p.showspam) {
$comments_showspam = get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span> $*comment_link_divider """;
} else {
- $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> $*comment_link_divider """;
+ $comments_showspam = """<a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span> $*comment_link_divider """;
}
}
if ($p.view == "entry") {print safe "$comments_showspam";}
@@ -1578,7 +1578,7 @@
}
else {
var string subitem_url = $this->url_of($i);
- """ $*link_divider <a href="$subitem_url#$*text_comments_id">$i</a>""";
+ """ $*link_divider <a href="$subitem_url">$i</a>""";
}
}
lay_nav_box_bottom();
Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -1520,9 +1520,9 @@
print safe "$*text_max_comments";
} else {
if ($p.view == "entry") {
- $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $.post_url});
} else {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+ print safe "<a href=\"$.post_url\">"+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
}
}
}
@@ -1535,7 +1535,7 @@
" <div class=\"commentsInfo\">\n ";
if ( not $.enabled ) {
- print safe "<a href='$.read_url#$*text_comments_id'>$*text_permalink</a>";
+ print safe "<a href='$.read_url'>$*text_permalink</a>";
"\n </div>";
return;
}
@@ -1549,7 +1549,7 @@
if ($p.showspam) {
print safe """$link_separator""" + get_plural_phrase($.spam_counter, "text_read_spam_comments");
} else {
- print safe """$link_separator<a href=\"$.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """</a>""";
+ print safe """$link_separator<a href=\"$.read_spam_url\">""" + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """</a>""";
}
}
}
Modified: trunk/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/opal/layout.s2 2012-06-04 13:49:04 UTC (rev 12056)
+++ trunk/bin/upgrading/s2layers/opal/layout.s2 2012-06-04 15:18:57 UTC (rev 12057)
@@ -1049,7 +1049,7 @@
if ($p.showspam) {
print safe """<span> """ + get_plural_phrase($.spam_counter, "text_read_spam_comments") + """ </span>""";
} else {
- print safe """<a href=\"$.read_spam_url#$*text_comments_id\"> """ + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """ </a>""";
+ print safe """<a href=\"$.read_spam_url\"> """ + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """ </a>""";
}
}
}
@@ -1062,9 +1062,9 @@
print safe "$*text_max_comments";
} else {
if ($p.view == "entry") {
- $p->print_reply_link({"target" => "topcomment", "linktext" => "$*text_post_comment", "class" => "reply_link", "reply_url" => $.post_url+"#$*text_addcomment_id"});
+ $p->print_reply_link({"target" => "topcomment", "linktext" => "$*text_post_comment", "class" => "reply_link", "reply_url" => $.post_url});
} else {
- print safe "<a href=\"$.post_url#$*text_addcomment_id\"> "+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+" </a>";
+ print safe "<a href=\"$.post_url\"> "+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+" </a>";
}
}
}
@@ -1073,7 +1073,7 @@
function CommentInfo::print_readlink {
var Page p = get_page();
- print safe "<a href=\"$.read_url#$*text_comments_id\"> "+
+ print safe "<a href=\"$.read_url\"> "+
get_plural_phrase($.count, $p.view == "friends" ?
"text_read_comments_friends" : "text_read_comments")+
" </a>";
@@ -1332,7 +1332,7 @@
} else {
var string url_of = $this->url_of($i);
- "<a href='$url_of#$*text_comments_id'><b>[$i]</b></a>";
+ "<a href='$url_of'><b>[$i]</b></a>";
}
}
"""</div></div></div>""";