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

[livejournal] r22165: LJSUP-12463: Double ancors for reply lin...

Committer: esavintcev
LJSUP-12463: Double ancors for reply link in journal styles
U   trunk/bin/upgrading/s2layers/punquin/layout.s2
U   trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
U   trunk/bin/upgrading/s2layers/sixhtml/layout.s2
U   trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
U   trunk/bin/upgrading/s2layers/tabularindent/layout.s2
U   trunk/bin/upgrading/s2layers/understroke/layout.s2
U   trunk/bin/upgrading/s2layers/variableflow/layout.s2
Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/punquin/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/punquin/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -661,9 +661,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>";
        }
     }
 }
@@ -689,7 +689,7 @@
                 if ($p.showspam) {
                     print safe get_plural_phrase($.spam_counter, "text_read_spam_comments");
                 } 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>""";
                 }
             }
         }

Modified: trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -787,7 +787,7 @@
       if ($en.comments.count > 0 or $en.comments.screened) {
         $url  = $en.comments.read_url;
         $text = get_plural_phrase($en.comments.count, ("text_read_comments" + ($p.view == "friends" ? "_friends" : "")));
-        $linkbar = $linkbar + """<a href="$url#$*text_comments_id">$text""";
+        $linkbar = $linkbar + """<a href="$url">$text""";
         if($en.comments.screened) {
           $text    = $*text_month_screened_comments;
           $linkbar = $linkbar + """ $text""";
@@ -797,7 +797,7 @@
             if ($p.showspam) {
                 $linkbar = $linkbar + get_plural_phrase($en.comments.spam_counter, "text_read_spam_comments") + """$btwn_comments""";
             } else {
-                $linkbar = $linkbar + """<a href=\"$en.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($en.comments.spam_counter, "text_read_all_spam_comments") + """</a>$btwn_comments""";
+                $linkbar = $linkbar + """<a href=\"$en.comments.read_spam_url\">""" + get_plural_phrase($en.comments.spam_counter, "text_read_all_spam_comments") + """</a>$btwn_comments""";
             }
         }
       }
@@ -806,11 +806,11 @@
         $linkbar = $linkbar + "$*text_max_comments$btwn_comments";
       } else {
         if ($p.view == "entry") {
-            $p->print_reply_link({"target" => "topcomment", "linktext" => "$*text_post_comment", "reply_url" => $en.comments.post_url+"#$*text_addcomment_id"}); print " | ";
+            $p->print_reply_link({"target" => "topcomment", "linktext" => "$*text_post_comment", "reply_url" => $en.comments.post_url}); print " | ";
         } else {
             $url  = $en.comments.post_url;
             $text = get_plural_phrase(0, ("text_post_comment" + ($p.view == "friends" ? "_friends" : "")));
-            $linkbar = $linkbar + """<a href="$url#$*text_addcomment_id">$text</a>$btwn_comments""";
+            $linkbar = $linkbar + """<a href="$url">$text</a>$btwn_comments""";
         }
       }
     }

Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -903,7 +903,7 @@
     print "<div>"; $.replyto->print_text(); "</div>";
 
     print "\n<hr />\n";
-    print safe """(<a id="$*text_addcomment_id" href="$.entry.permalink_url#$*text_comments_id">$*text_reply_back</a>)""";
+    print safe """(<a id="$*text_addcomment_id" href="$.entry.permalink_url">$*text_reply_back</a>)""";
     if ($.entry->viewer_sees_ebox()) {
         """<div style="text-aling: center; margin-bottom: 20px;">""";
         $.entry->print_ebox();
@@ -1008,9 +1008,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>";
        }
     }
 }
@@ -1209,7 +1209,7 @@
                 if ($p.showspam) {
                     print safe """ $sep """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments");
                 } else {
-                    print safe """ $sep <a href=\"$e.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
+                    print safe """ $sep <a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>""";
                 }
             }
          }

Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -720,9 +720,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>";
        }
     }
 }
@@ -740,7 +740,7 @@
             if ($p.showspam) {
                 print safe get_plural_phrase($.spam_counter, "text_read_spam_comments");
             } 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>""";
             }
         }
         if ($.show_readlink) {

Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -586,7 +586,7 @@
     if ($footer) {
         #TODO - rewrite with this.save
         print  "<tr><td style='white-space: nowrap'>$*text_left_comments";
-        $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $e.comments.post_url+"#$*text_addcomment_id"});
+        $p->print_reply_link({"target" => "topcomment", "linktext" => $*text_post_comment, "reply_url" => $e.comments.post_url});
         " $footer";
         
         if ($p.view == "entry")
@@ -767,7 +767,7 @@
         $footer = $footer + "$*text_left_comments";
         if ($e.comments.show_readlink) {
             $footer = $footer +
-                      "<a href=\"$e.comments.read_url#$*text_comments_id\">" +
+                      "<a href=\"$e.comments.read_url\">" +
                       get_plural_phrase($e.comments.count, $p.view == "friends" ? "text_read_comments_friends" : "text_read_comments") +
                       "</a>";
         }
@@ -786,7 +786,7 @@
                     $footer = "";
                 } else {
                     $footer = $footer +
-                        "<a href=\"$e.comments.post_url#$*text_addcomment_id\">" +
+                        "<a href=\"$e.comments.post_url\">" +
                         ($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment) +
                         "</a>";
                 }
@@ -1012,7 +1012,7 @@
 		if ($p.showspam) {
 		    print """<p width='95%' style='text-align:center;'>""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</p>""";
 		} else {
-		    print """<p width='95%' style='text-align:center;'><a href=\"$e.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></p>""";
+		    print """<p width='95%' style='text-align:center;'><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></p>""";
 		}
 	}
         if ($.comment_pages.total_subitems > 0) {

Modified: trunk/bin/upgrading/s2layers/understroke/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/understroke/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/understroke/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -702,8 +702,8 @@
 function _entry_links(Entry e) : string[][] {
 	var Page p = get_page();
 	var string[][] result = (($p.view != "entry") and ($p.view != "reply"))?[
-		["count", $e.comments.show_readlink?get_plural_phrase($e.comments.count,"text_read_comments"):"", $e.comments.read_url + "#$*text_comments_id"],
-		["comments", $e.comments.show_postlink?($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment):"", $e.comments.post_url + "#$*text_addcomment_id" ]
+		["count", $e.comments.show_readlink?get_plural_phrase($e.comments.count,"text_read_comments"):"", $e.comments.read_url],
+		["comments", $e.comments.show_postlink?($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment):"", $e.comments.post_url ]
 	]:[[""]];
 	var string{} link_captions = {
 		"edit_entry" => $*text_edit_entry,
@@ -945,7 +945,7 @@
 	if ($.entry.comments.enabled) {
 		"""$*_{"HR"}<div id="comments">""";
 		"""<div class="comments-links">( $comments_count<span class="replylink">""";
-        $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });
+        $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });
         """</span> )</div>""";
 		$this->print_reply_container({ "target" => "topcomment" });
 		if ($.comment_pages.total_subitems > 0) {
@@ -953,7 +953,7 @@
 			$.comment_pages->print();
 			$this->print_multiform_start();
 			$this->print_comments($.comments);
-			"""<div class="comments-links">( $comments_count<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" }); """</span> )</div>""";
+			"""<div class="comments-links">( $comments_count<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url }); """</span> )</div>""";
 			$this->print_reply_container({"target" => "bottomcomment"});
 			if ($.comment_pages.all_subitems_displayed) { "$*_{"HR"}"; }
 			$this->print_multiform_actionline();

Modified: trunk/bin/upgrading/s2layers/variableflow/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/variableflow/layout.s2	2012-06-05 07:18:39 UTC (rev 22164)
+++ trunk/bin/upgrading/s2layers/variableflow/layout.s2	2012-06-05 07:48:05 UTC (rev 22165)
@@ -733,7 +733,7 @@
                 if ($p.showspam) {
                     """<li class="comments-hidespam">""" + get_plural_phrase($.spam_counter, "text_read_spam_comments") + """</li>""";
                 } else {
-                    """<li class="comments-showspam"><a href=\"$.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """</a></li>""";
+                    """<li class="comments-showspam"><a href=\"$.read_spam_url\">""" + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """</a></li>""";
                 }
             }
         }
@@ -834,7 +834,7 @@
             print "<li class=\"current\">$i</li>";
         }
         else {
-            print "<li><a href=\""+$.comment_pages->url_of($i)+"#$*text_comments_id\">$i</a></li>";
+            print "<li><a href=\""+$.comment_pages->url_of($i)+"\">$i</a></li>";
         }
     }
     print "</ul>";

Tags: esavintcev, livejournal, 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