Максим Червонный (fiskus_boulder) wrote in changelog,
Максим Червонный
fiskus_boulder
changelog

[ljcom] r10401: LJSUP-8609: link to Read comments from s...

Committer: mchervonniy
LJSUP-8609: link to Read comments from spam comments page
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-19 10:18:19 UTC (rev 10400)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-20 02:37:20 UTC (rev 10401)
@@ -2107,7 +2107,11 @@
         var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $.entry.permalink_url) + "#comments";
         $comments_count = """<a href="$toplink">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a>""";
     } else {
-        $comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
+	if ($p.showspam) {
+            $comments_count = """<a href="$.entry.permalink_url#comments">""" + get_plural_phrase($.entry.comments.count, "text_read_comments") + """</a>""";
+	} else {
+            $comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
+	}
     }
     if ($.entry.comments.count > 0) {
 		if (not $.entry.comments.locked) {

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-19 10:18:19 UTC (rev 10400)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-20 02:37:20 UTC (rev 10401)
@@ -1956,7 +1956,7 @@
             $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">""" + get_plural_phrase($.entry.comments.count, "text_read_comments") + """</a>""";
+            $comments_count = """<a href="$.entry.permalink_url#comments">""" + get_plural_phrase($.entry.comments.count, "text_read_comments") + """</a>""";
 	    } else {
             $comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
 	    }

Tags: fiskus_boulder, ljcom, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments