Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[ljcom] r10134: LJSUP-7758: AntiSpam S2

Committer: esavintcev
LJSUP-7758: AntiSpam S2
U   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
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -800,9 +800,9 @@
     var string comments_showspam = "";
     if ($e.comments.count > 0 and not $e.comments.locked) {
         if ($p.showspam) {
-            $comments_showspam = """<a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/style/3column/spam.png" alt="$*text_hidespam"/></a>""";
+            $comments_showspam = """<a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/style/3column/spam.png" alt="$*text_hidespam" title="$*text_hidespam ($e.comments.spam_counter)" /></a>""";
         } else {
-            $comments_showspam = """<a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/style/3column/unspam.png" alt="$*text_showspam"/></a>""";
+            $comments_showspam = """<a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/style/3column/unspam.png" alt="$*text_showspam" title="$*text_showspam ($e.comments.spam_counter)" /></a>""";
         }
     } else {
         $comments_showspam = "";

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -746,9 +746,9 @@
         var string comments_showspam = "";
         if ($.comments.count > 0 and not $.comments.locked) {
             if ($p.showspam) {
-                $comments_showspam = """ <a href="$.comments.read_spam_url">$*text_hidespam</a> """;
+                $comments_showspam = """ <a href="$.comments.read_spam_url">$*text_hidespam ($.comments.spam_counter)</a> """;
             } else {
-                $comments_showspam = """ <a href="$.comments.read_spam_url">$*text_showspam</a> """;
+                $comments_showspam = """ <a href="$.comments.read_spam_url">$*text_showspam ($.comments.spam_counter)</a> """;
             }
         }
         print safe """ &middot; $comments_showspam""";

Modified: trunk/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -928,9 +928,9 @@
                     var string comments_showspam = "";
                     if ($e.comments.count > 0 and not $e.comments.locked) {
                         if ($p.showspam) {
-                            $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_unspam.gif" align="middle" border="0" alt="$*text_hidespam" /></a></span> """;
+                            $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_unspam.gif" align="middle" border="0" alt="$*text_hidespam" title="$*text_hidespam ($e.comments.spam_counter)" /></a></span> """;
                         } else {
-                            $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" /></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="$*text_showspam ($e.comments.spam_counter)" /></a></span> """;
                         }
                     }
                     if ($p.view == "entry") {

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -2207,9 +2207,9 @@
                             var string comments_showspam = "";
                             if ($e.comments.count > 0 and not $e.comments.locked) {
                                 if ($p.showspam) {
-                                    $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_hidespam</a>""";
+                                    $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_hidespam ($e.comments.spam_counter)</a>""";
                                 } else {
-                                    $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_showspam</a>""";
+                                    $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_showspam ($e.comments.spam_counter)</a>""";
                                 }
                             } else {
                                 $comments_showspam = "";

Modified: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1383,9 +1383,9 @@
                     var string comments_showspam = "";
                     if ($e.comments.count > 0 and not $e.comments.locked) {
                         if ($p.showspam) {
-                            $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_hidespam</a>""";
+                            $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_hidespam ($e.comments.spam_counter)</a>""";
                         } else {
-                            $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_showspam</a>""";
+                            $comments_showspam = """<a href="$e.comments.read_spam_url">$*text_showspam ($e.comments.spam_counter)</a>""";
                         }
                     } else {
                         $comments_showspam = "";

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -2103,15 +2103,15 @@
     var string comments_showspam = "";
     if ($.entry.comments.count > 0 and not $.entry.comments.locked) {
         if ($p.showspam) {
-            $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam</a></span> <span class="emdash">—</span> """;
+            $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam ($.entry.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
         } else {
-            $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam</a></span> <span class="emdash">—</span> """;
+            $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam ($.entry.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
         }
     } elseif ($.entry.comments.count > 0) {
         if ($p.showspam) {
-            $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam</a></span> """;
+            $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam ($.entry.comments.spam_counter)</a></span> """;
         } else {
-            $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam</a></span> """;
+            $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam ($.entry.comments.spam_counter)</a></span> """;
         }
     } else {
         $comments_showspam = "";

Modified: trunk/bin/upgrading/s2layers/gradient/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/gradient/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/gradient/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1484,9 +1484,9 @@
    var string comments_showspam = "";
    if ($e.comments.count > 0 and not $e.comments.locked) {
       if ($p.showspam) {
-         $comments_showspam = """<a href=\"$e.comments.read_spam_url\">$*text_hidespam</a></span> """;
+         $comments_showspam = """<a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span> """;
       } else {
-         $comments_showspam = """<a href=\"$e.comments.read_spam_url\">$*text_showspam</a></span> """;
+         $comments_showspam = """<a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a></span> """;
       }
    }
    if ($p.view == "entry") {print safe "$comments_showspam $*comment_link_divider ";}

Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1527,9 +1527,9 @@
         $this->print_readlink();
         if ($p.view == "entry") {
             if ($p.showspam) {
-                print safe """$link_separator<a href=\"$.read_spam_url\">$*text_hidespam</a>""";
+                print safe """$link_separator<a href=\"$.read_spam_url\">$*text_hidespam ($.spam_counter)</a>""";
             } else {
-                print safe """$link_separator<a href=\"$.read_spam_url\">$*text_showspam</a>""";
+                print safe """$link_separator<a href=\"$.read_spam_url\">$*text_showspam ($.spam_counter)</a>""";
             }
         }
     } else {

Modified: trunk/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/opal/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/opal/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1041,9 +1041,9 @@
             $this->print_readlink();
             if ($p.view == "entry") {
                 if ($p.showspam) {
-                    print safe """<a href=\"$.read_spam_url\">&nbsp;&nbsp; $*text_hidespam &nbsp;&nbsp;</a>""";
+                    print safe """<a href=\"$.read_spam_url\">&nbsp;&nbsp; $*text_hidespam ($.spam_counter) &nbsp;&nbsp;</a>""";
                 } else {
-                    print safe """<a href=\"$.read_spam_url\">&nbsp;&nbsp; $*text_showspam &nbsp;&nbsp;</a>""";
+                    print safe """<a href=\"$.read_spam_url\">&nbsp;&nbsp; $*text_showspam ($.spam_counter) &nbsp;&nbsp;</a>""";
                 }
             }
         }

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1689,9 +1689,9 @@
           var string comments_showspam = "";
           if ($p.view == "entry") {
               if ($p.showspam) {
-                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url\">$*text_hidespam</a></li>""";
+                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url\">$*text_hidespam ($.comments.spam_counter)</a></li>""";
               } else {
-                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url\">$*text_showspam</a></li>""";
+                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url\">$*text_showspam ($.comments.spam_counter)</a></li>""";
               }
           }
           if ($.comments.enabled) {

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -939,15 +939,15 @@
         var string comments_showspam = "";
         if ($e.comments.count > 0 and not $.entry.comments.locked) {
             if ($p.showspam) {
-                $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam</a></span> <span class="emdash">—</span> """;
+                $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
             } else {
-                $comments_showspam = """<span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">$*text_showspam</a></span> <span class="emdash">—</span> """;
+                $comments_showspam = """<span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
             }
         } elseif ($e.comments.count > 0) {
             if ($p.showspam) {
-                $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam</a></span> """;
+                $comments_showspam = """<span class="comments-hidespam"><a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span> """;
             } else {
-                $comments_showspam = """<span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">$*text_showspam</a></span> """;
+                $comments_showspam = """<span class="comments-showspam"><a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a></span> """;
             }
         } else {
             $comments_showspam = "";

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1179,9 +1179,9 @@
         print safe get_permalink($e.permalink_url);
         if ( $p.view == "entry" and $e.comments.count > 0) {
             if ($p.showspam) {
-                """ | <a href=\"$e.comments.read_spam_url\">$*text_hidespam</a></span>""";
+                """ | <a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a></span>""";
             } else {
-                """ | <a href=\"$e.comments.read_spam_url\">$*text_showspam</a></span>""";
+                """ | <a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a></span>""";
             }
         }
         if ( $p.view != "entry" and $p.view != "reply" ) {

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -987,9 +987,9 @@
         }
         if (($e.comments.count > 0 or $e.comments.screened) and $.view == "entry") {
             if ($p.showspam) {
-                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_hidespam</a><br />""";
+                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a><br />""";
             } else {
-                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_showspam</a><br />""";
+                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a><br />""";
             }
         }
     }

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-02-25 12:59:26 UTC (rev 10133)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-02-28 05:22:39 UTC (rev 10134)
@@ -1958,15 +1958,15 @@
         var string comments_showspam = "";
         if ($.entry.comments.count > 0 and not $.entry.comments.locked) {
             if ($p.showspam) {
-                $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam</a></span> <span class="emdash">—</span> """;
+                $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam ($.entry.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
             } else {
-                $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam</a></span> <span class="emdash">—</span> """;
+                $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam ($.entry.comments.spam_counter)</a></span> <span class="emdash">—</span> """;
             }
         } elseif ($.entry.comments.count > 0) {
             if ($p.showspam) {
-                $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam</a></span> """;
+                $comments_showspam = """<span class="comments-hidespam"><a href=\"$.entry.comments.read_spam_url\">$*text_hidespam ($.entry.comments.spam_counter)</a></span> """;
             } else {
-                $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam</a></span> """;
+                $comments_showspam = """<span class="comments-showspam"><a href=\"$.entry.comments.read_spam_url\">$*text_showspam ($.entry.comments.spam_counter)</a></span> """;
             }
         } else {
             $comments_showspam = "";

Tags: ljcom, s2, savintsev_egor
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