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

[ljcom] r12059: LJSUP-12463: Double ancors for reply lin...

Committer: esavintcev
LJSUP-12463: Double ancors for reply link in journal styles
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/sup/themes.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/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -1712,21 +1712,21 @@
               if ($p.showspam) {
                   $comments_showspam = """<li>""" + get_plural_phrase($.comments.spam_counter, "text_read_spam_comments") + """</li>""";
               } else {
-                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($.comments.spam_counter, "text_read_all_spam_comments") + """</a></li>""";
+                  $comments_showspam = """<li><a href=\"$.comments.read_spam_url\">""" + get_plural_phrase($.comments.spam_counter, "text_read_all_spam_comments") + """</a></li>""";
               }
           }
           if ($.comments.enabled) {
             if (($.itemid==int($*layout_guestbook_entryid) and (not $.delayed))) {
-                print safe """<li><a href="$.comments.post_url#$*text_addcomment_id">$*text_post_comment_guestbook</a></li>""";
+                print safe """<li><a href="$.comments.post_url">$*text_post_comment_guestbook</a></li>""";
                 print safe """$comments_showspam""";
             } else {
               if ($.comments.count > 0 or $.comments.screened) {
-                """<li><a href="$.comments.read_url#$*text_comments_id">"""; print safe get_plural_phrase($.comments.count,"text_read_comments"); """</a></li>""";
+                """<li><a href="$.comments.read_url">"""; print safe get_plural_phrase($.comments.count,"text_read_comments"); """</a></li>""";
                 """$comments_showspam""";
               }
               $printqr = true;
                 if (not $.comments.locked) {
-                """<li>"""; $p->print_reply_link({"linktext" => $*text_post_comment, "target" => "qr$.journal.username$.itemid", "reply_url" => $.comments.post_url+"#$*text_addcomment_id"}); """</li>""";
+                """<li>"""; $p->print_reply_link({"linktext" => $*text_post_comment, "target" => "qr$.journal.username$.itemid", "reply_url" => $.comments.post_url}); """</li>""";
                 }
             }
           }

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -996,14 +996,14 @@
     var string text_count = ($*active_theme == "x3")?get_plural_phrase($.count,"text_read_comments"):string($.count);
   
     if ($.show_readlink) {
-        """<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span><span><span>$text_count</span></span></span></a></li>""";
+        """<li class="comments"><a href="$.read_url" class="btn btn-comments"><span><span><span>$text_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#$*text_addcomment_id" 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" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>";
         }
         "</li>";
     }
@@ -1031,7 +1031,7 @@
     }
     var string comments_count = string($e.comments.count);
     if ($.viewing_thread or $p.showspam) {
-        var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $e.permalink_url) + "#$*text_comments_id";
+        var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $e.permalink_url);
         $comments_count = """<a href="$toplink">"""+ get_plural_phrase($e.comments.count, "text_read_all_comments") +"""</a>""";
     } else {
         $comments_count = get_plural_phrase($e.comments.count, "text_read_comments");
@@ -1069,14 +1069,14 @@
             if ($p.showspam) {
                 $comments_showspam = """<span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span> <span class="emdash">—</span> """;
             } else {
-                $comments_showspam = """<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> <span class="emdash">—</span> """;
+                $comments_showspam = """<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> <span class="emdash">—</span> """;
             }
         } else {
             $comments_showspam = "";
         }
         """<div class="comments-links">( $comments_count $comments_showspam""";
         if (not $.entry.comments.locked) {
-        """<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</span>""";
+        """<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</span>""";
         }
 
         var string rated_count = "";
@@ -1103,7 +1103,7 @@
             """<div class="comments-footer">""";
             """<div class="comments-links">( $comments_count $comments_showspam""";
             if (not $.entry.comments.locked) { 
-            """<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" }); """</span>""";
+            """<span class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url }); """</span>""";
             }
             """ )$rated_count</div>""";
             $this->print_reply_container({"target" => "bottomcomment"});

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -234,14 +234,14 @@
 function CommentInfo::print() {
     var Page p = get_page();
     if ($.show_readlink) {
-        """<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span><span><span>$.count</span></span></span></a></li>""";
+        """<li class="comments"><a href="$.read_url" 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#$*text_addcomment_id" 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" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>";
         }
         "</li>";
     }
@@ -475,14 +475,14 @@
 function CommentInfo::print() {
     var Page p = get_page();
     if ($.show_readlink) {
-        """<li class="comments"><a href="$.read_url#$*text_comments_id">$.count</a></li>""";
+        """<li class="comments"><a href="$.read_url">$.count</a></li>""";
     }
     if ($.show_postlink) {
         """<li class="postcomment">""";
         if ($.maxcomments) {
             print safe """$*text_max_comments""";
         } else {
-            """<a href="$.post_url#$*text_addcomment_id">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+            """<a href="$.post_url">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
         }
         "</li>";
     }
@@ -528,14 +528,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#$*text_comments_id" class="btn btn-comments"><span>$text_count</span></a></li>""";
+        """<li class="comments"><a href="$.read_url" 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#$*text_addcomment_id" 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" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>";
         }
         "</li>";
     }
@@ -830,7 +830,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#$*text_comments_id\">""" + 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\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
             }
         } else {
             $comments_showspam = "";
@@ -844,7 +844,7 @@
         if (not $.entry.comments.locked) {
             """
             <div class="comments-reply">
-                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</p>
                 """;
                 """
             </div>
@@ -863,7 +863,7 @@
             if (not $.entry.comments.locked) { 
                 """
                 <div class="comments-reply">
-                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url });"""</p>
                     """;
                     """
                 </div>
@@ -1215,7 +1215,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#$*text_comments_id\">""" + 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\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
             }
         } else {
             $comments_showspam = "";
@@ -1229,7 +1229,7 @@
         if (not $.entry.comments.locked) {
             """
             <div class="comments-reply">
-                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</p>
                 """;
                 """
             </div>
@@ -1248,7 +1248,7 @@
             if (not $.entry.comments.locked) { 
                 """
                 <div class="comments-reply">
-                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url });"""</p>
                     """;
                     """
                 </div>
@@ -1600,7 +1600,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#$*text_comments_id\">""" + 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\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
             }
         } else {
             $comments_showspam = "";
@@ -1614,7 +1614,7 @@
         if (not $.entry.comments.locked) {
             """
             <div class="comments-reply">
-                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</p>
                 """;
                 """
             </div>
@@ -1633,7 +1633,7 @@
             if (not $.entry.comments.locked) { 
                 """
                 <div class="comments-reply">
-                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url });"""</p>
                     """;
                     """
                 </div>
@@ -1985,7 +1985,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#$*text_comments_id\">""" + 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\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
             }
         } else {
             $comments_showspam = "";
@@ -1999,7 +1999,7 @@
         if (not $.entry.comments.locked) {
             """
             <div class="comments-reply">
-                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</p>
                 """;
                 """
             </div>
@@ -2018,7 +2018,7 @@
             if (not $.entry.comments.locked) { 
                 """
                 <div class="comments-reply">
-                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url+"#$*text_addcomment_id" });"""</p>
+                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url });"""</p>
                     """;
                     """
                 </div>
@@ -2296,6 +2296,7 @@
 layerinfo "redist_uniq" = "sup/poker";
 set theme_css = "poker.css";
 set active_theme = "x6";
+set theme_designer = "Gennady";
 set show_title_on_tagpage = true;
 
 function _print_entry(Entry e) {
@@ -2559,14 +2560,14 @@
     var string text_count = get_plural_phrase($.count,"text_read_comments");
   
     if ($.show_readlink) {
-        """<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span><span><span>$text_count</span></span></span></a></li>""";
+        """<li class="comments"><a href="$.read_url" class="btn btn-comments"><span><span><span>$text_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#$*text_addcomment_id" 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" class="btn btn-comment"><span><span><span>"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</span></span></span></a>";
         }
         "</li>";
     }
@@ -2849,14 +2850,14 @@
     var string text_count = get_plural_phrase($.count,"text_read_comments");
   
     if ($.show_readlink) {
-        """<li class="comments"><a href="$.read_url#$*text_comments_id">$text_count</a></li>""";
+        """<li class="comments"><a href="$.read_url">$text_count</a></li>""";
     }
     if ($.show_postlink) {
         """<li class="postcomment">""";
         if ($.maxcomments) {
             print safe """$*text_max_comments""";
         } else {
-            """<a href="$.post_url#$*text_addcomment_id">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+            """<a href="$.post_url">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
         }
         "</li>";
     }
@@ -3329,3 +3330,389 @@
 set show_title_on_tagpage = true;
 set hide_comment_controls = true;
 set theme_designer = "yoksel";
+
+
+#NEWLAYER: sup/football
+layerinfo "type" = "theme";
+layerinfo "name" = "Football";
+layerinfo "redist_uniq" = "sup/football";
+set theme_css = "football.css";
+set active_theme = "ipad1";
+set recent_show_date = true;
+set friends_show_date = true;
+set recent_show_upic = false;
+set friends_show_upic = false;
+set theme_designer = "Gennady";
+set show_title_on_tagpage = true;
+
+function _print_CSS {
+    var Page p = get_page();
+    
+    if ($*use_stylesheets) {
+        $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
+        $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
+        
+        if ($*use_theme_stylesheet) {
+            if ($*theme_css) {                
+                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+            }            
+            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+        }
+    }
+}
+
+function Page::print() {
+    if ($.view == "recent") {$*_RecentPage = $this as RecentPage;} elseif ($.view == "friends") {$*_FriendsPage = $this as FriendsPage;} elseif ($.view == "day") {$*_DayPage = $this as DayPage;} elseif ($.view == "month") {$*_MonthPage = $this as MonthPage;} elseif ($.view == "archive") {$*_YearPage = $this as YearPage;}
+    _global_init_();
+    var string _upic = $.journal.default_pic?"""<div class="userpic"><div class="userpic-in"><img alt="${.journal.default_pic.alttext}" width="${.journal.default_pic.width}" height="${.journal.default_pic.height}" """+ ($*active_theme == "x2" or $*active_theme == "x4"?"style=\"margin-top:"+ (100-${.journal.default_pic.height})/2 +"px;\"":"") +"""src="${.journal.default_pic.url}" /></div></div>""":"";
+    var string _h1 = "<h1>" + _user_print($.journal, "microformatted") + "</h1>";
+    var string _nav = """ <li class="item item-recent""" + (($.view == "recent")?" item-selected":"") + """"><a""" + (($*exact_view != "recent_first")?" rel=\"home\" href=\"$*base_url\"":"") + """>$*text_view_recent</a></li> <li class="item item-friends""" + (($.view == "friends")?" item-selected":"") + """"><a""" + (($*exact_view != "friends_first")?" href=\"$*base_url/friends\"":"") + """>$*text_view_friends</a></li> <li class="item item-archive""" + (($.view == "archive" or $.view == "month" or $.view == "day")?" item-selected":"") + """"><a""" + (($*exact_view != "archive_first")?" href=\"$*base_url/calendar\"":"") + """>$*text_view_archive</a></li> <li class="item item-profile"><a href="$*base_url/profile">$*text_view_userinfo</a></li> <li class="item item-tag""" + (($.view == "tags")?" item-selected":"") + """"><a href="$*base_url/tag">$*text_tags_page_header</a></li> """;
+    var string rsslink = ($.data_link{"rss"})?($.data_link{"rss"}.url):"$*base_url/data/rss";
+    var Link addlink = $.journal -> get_link("add_friend");
+    var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
+    var string _nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a class="btn btn-add" href="$addfriend"><span><span><span>$*text_friend_add</span></span></span></a></li> """ : "") + """ <li class="item item-rss"><a class="btn btn-rss" href="$rsslink"><span><span><span>RSS</span></span></span></a></li>""";
+    if ($*active_theme == "x3") { $_nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a href="$addfriend">$*text_friend_add</a></li> """ : "") + """ <li class="item item-rss"><a href="$rsslink">RSS</a></li> """; }
+    var string _h2 = """<h2><span>$.global_title</span></h2>""";
+    var string _h3 = "";
+    if ($.view == "friends" and $*_FriendsPage.friends_title != "") {
+        $_h3 = "<h3><span>$*_FriendsPage.friends_title</span></h3>";
+    } elseif ($.global_subtitle != "") {
+        $_h3 = "<h3><span>$.global_subtitle</span></h3>";
+    }
+    var string _hfeed = ($.view=="recent" or $.view=="friends" or $.view=="day")?" hfeed":"";
+    _Header();
+"""
+<div id="page">
+    <div class="layout $*active_theme">
+    <div class="layout-inner">
+            <div class="content$_hfeed">
+                <div class="content-inner">
+                    <div class="header">
+                        <div class="nav-wrapper""" + ($addfriend ? " nav-addfriend" : "") + """\">
+                        <ul class="nav">
+                            $_nav
+                            $_nav_sub
+                        </ul>
+                        </div>
+                        $_upic
+                        <div class="header-heads">
+                        $_h1
+                        $_h2
+                        $_h3
+                        </div>
+                    </div>
+                    <div class="hr hr-afterhead"><hr /></div>
+                    """;$this->print_body();"""
+                </div>
+            </div>
+""";
+    if ($.view == "recent") {
+            _Sidebar();
+    }
+"""
+        </div>
+        </div>
+    </div>
+""";
+    _Footer();
+}
+
+function _Sidebar {
+    var Page p=get_page();
+"""
+                <div class="sidebar">
+                    <div class="sidebar-inner">
+""";
+    if ($*layout_show_calendar) {
+"""
+                    <dl class="sidebar-block sidebar-cal">
+                        <dt>$*text_view_archive</dt>
+                        <dd class="calendar-wrap">"""; _calendar($p->get_latest_month(), "sidebar"); """</dd>
+                    </dl>
+""";
+    }
+
+    if (size($p->visible_tag_list()) > 0 and $*layout_show_tags and $p.view!="tags") {
+        if ($*layout_show_calendar or (size($p.linklist) > 0 and $*layout_show_links)) {"""<div class="hr"><hr /></div>""";}
+"""
+                    <dl class="sidebar-block sidebar-tags">
+                        <dt>$*text_tags_section_header</dt>
+                        <dd class="tags">""";
+if ($*tag_limit) {
+    _taglist($*tag_cloud_max,108);
+} else {
+    _taglist(108);
+} """</dd>
+                    </dl>
+""";
+    }
+    """
+                        </div>
+                    </div>
+    """;
+
+
+}
+
+function RecentPage::print_body {
+    var Page p = get_page();
+
+    if ($.tagfilter_active and $*show_title_on_tagpage) {
+
+        var string delim = $*text_entries_bytag_or;
+        if($.tagfilter_mode == "and"){
+            $delim = $*text_entries_bytag_and;
+        }
+       
+       var string tagpage_header = get_plural_phrase(size( $.tagfilter_tags), "text_entries_bytag");
+ 
+        """<h3 class="tag-page-header">$tagpage_header: """;
+            var int counter = 0;
+            foreach var Tag tag ($.tagfilter_tags) {
+                $counter++;
+                """$tag.name""";
+                if($counter < size($.tagfilter_tags)){
+                    """ $delim """;          
+                }
+            }
+        """</h3>""";
+    } 
+
+    if ($*sticky_post!="" and $*exact_view == "recent_first") {
+"""
+                        <div class="entry-wrap disabledcomments">
+                        <dl class="entry" id="post-sticky">
+                            <dt class="entry-title">""" + ($*sticky_subject!="" ? $*sticky_subject : "Sticky post") +"""</dt>
+                            <dd class="entry-text">
+                                <div class="entry-content">$*sticky_post</div>
+                            </dd>
+                        </dl>
+                        </div>
+                        <div class="hr"><hr /></div>
+""";
+    }
+    foreach var Entry e ($.entries) {
+        _print_entry($e);
+        """
+        <!-- $e.itemid -->
+        """;
+    }
+    if (size $.entries > 0 and ($.nav.backward_url != "" or $.nav.forward_url != "" or ($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1))) {
+"""
+                <ul class="page-nav">
+""";
+        if ($.nav.backward_url != "") {
+"""
+                    <li class="prev"><a href="$.nav.backward_url" class="item">"""+get_plural_phrase($.nav.backward_count, "text_skiplinks_back")+"""</a></li>
+""";
+        }
+        if (($p.view == "recent" and $*page_recent_items != 1) or ($p.view == "friends" and $*page_friends_items != 1)) {
+"""
+                    <li class="ontop"><a href="#" onclick="jQuery('body,html').animate({scrollTop:0},500);return false;" class="item">$*text_totop</a></li>
+""";
+        }
+        if ($.nav.forward_url != "") {
+"""
+                    <li class="next"><a href="$.nav.forward_url" class="item">"""+get_plural_phrase($.nav.forward_count, "text_skiplinks_forward")+"""</a></li>
+""";
+        }
+"""
+                </ul>
+""";
+    }
+}
+
+function DayPage::print_body() {
+    var string corners1 = "";
+    var string corners1_2 = "";
+    var string corners2 = "";
+    if ($*active_theme == "x4") {
+        $corners1 = """<i class="cornerz cornerz-top"><b></b></i>""";
+        $corners2 = """<i class="cornerz cornerz-bot"><b></b></i>""";
+    } elseif ($*active_theme == "x5") {
+        $corners1_2 = """<i class="cornerz cornerz-top"><b></b></i>""";
+        $corners2 = """<i class="cornerz cornerz-bot"><b></b></i>""";
+    }
+    if ($.has_entries) {
+        foreach var Entry e ($.entries) {
+            _print_entry($e);
+        }
+    } else {
+"""
+                <div class="entry-wrap">$corners1$corners1_2<div class="entry"><div class="entry-text"><p>$*text_noentries_day</p></div></div>$corners2</div>
+""";
+    }
+"""
+                <ul class="page-nav">
+                    <li class="prev"><a class="item" href="$.prev_url">$*text_day_prev</a></li>
+""";
+    if (size $.entries > 1) {
+"""
+                    <li class="ontop"><a href="#" onclick="jQuery('body,html').animate({scrollTop:0},500);return false;" class="item">$*text_totop</a></li>
+""";
+    }
+"""
+                    <li class="next"><a class="item" href="$.next_url">$*text_day_next</a></li>
+                </ul>
+""";
+}
+
+function ItemRange::print() {
+    if ($.all_subitems_displayed) { return; }
+    
+    """<ul class="comments-pages">""";
+    
+    var string url_prev = $this->url_of($.current - 1);
+    if ($.current != 1) {
+        """<li class="comments-pages-prev"><a href="$url_prev#comments"><img src="$*IMGDIR/spacer.gif" width="7" height="13" alt="&laquo;" class="comments-pages-arr" /></a></li>""";
+    } else {
+        """<li class="comments-pages-prev comments-pages-prev-dis"><img src="$*IMGDIR/spacer.gif" width="7" height="13" alt="&laquo;" class="comments-pages-arr" /></li>""";
+    }
+    
+    foreach var int i (1..$.total) {
+        var string class_first = ($i == 1 ? " comments-pages-first" : "");
+        if ($i == $.current) {
+            """<li class="comments-pages-item comments-pages-current$class_first">$i</li>""";
+        }
+        else {
+            var string url_of = $this->url_of($i);
+            """<li class="comments-pages-item$class_first"><a href="$url_of#comments">$i</a></li>""";
+        }
+    }
+
+    var string url_next = $this->url_of($.current + 1);
+    if ($.current != $.total) {
+        """<li class="comments-pages-next"><a href="$url_next#comments"><img src="$*IMGDIR/spacer.gif" width="7" height="13" alt="&raquo;" class="comments-pages-arr" /></a></li>""";
+    } else {
+        """<li class="comments-pages-next comments-pages-next-dis"><img src="$*IMGDIR/spacer.gif" width="7" height="13" alt="&raquo;" class="comments-pages-arr" /></li>""";
+    }
+    
+    """</ul>""";
+}
+
+
+function EntryPage::print_body {
+    var Page p = get_page();
+    var Entry e = $.entry;
+
+    _print_entry($e);
+    
+    if ($.entry.comments.enabled) {
+"""
+                    <div class="entry-wrap entry-comments" id="comments">
+                    <div class="entry">
+                        <div class="entry-text"><div class="entry-comments-text">
+""";
+        var string comments_count = string($e.comments.count);
+        if ($.viewing_thread or $p.showspam) {
+            var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $e.permalink_url) + "#comments";
+            $comments_count = """<a href="$toplink">"""+ get_plural_phrase($e.comments.count, "text_read_all_comments") +"""</a>""";
+        } else {
+            $comments_count = get_plural_phrase($e.comments.count, "text_read_comments");
+        }
+        if (not $.entry.comments.locked) {
+            $comments_count = """<span class="comments-count">$comments_count</span>""";
+        } else {
+            $comments_count = "";
+        }
+        var string comments_showspam = "";
+        if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
+            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>""";
+            }
+        } else {
+            $comments_showspam = "";
+        }
+        """<div class="comments-links">$comments_count$comments_showspam</div>""";
+
+        if ($.comment_pages.total_subitems > 0) {
+            $.comment_pages->print();
+        }
+        
+        if (not $.entry.comments.locked) {
+            """
+            <div class="comments-reply">
+                <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "topcomment", "reply_url" => $e.comments.post_url });"""</p>
+                """;
+                """
+            </div>
+            """;
+            $this->print_reply_container({ "target" => "topcomment" });
+        }
+
+        if ($.comment_pages.total_subitems > 0) {
+            $this->print_multiform_start();
+
+            $this->print_comments($.comments);
+
+            $this->print_multiform_actionline();
+            $this->print_multiform_end();
+
+            if (not $.entry.comments.locked) { 
+                """
+                <div class="comments-reply">
+                    <p class="replylink">"""; $this->print_reply_link({ "linktext" => $*text_post_comment, "target" => "bottomcomment", "reply_url" => $e.comments.post_url });"""</p>
+                    """;
+                    """
+                </div>
+                """;
+                $this->print_reply_container({ "target" => "bottomcomment" });
+            }
+
+            $.comment_pages->print();
+        }
+
+"""
+                        </div></div>
+                    </div>
+                    </div>
+""";
+    }
+}
+
+function EntryPage::print_comment_full (Comment c) {
+    var Page p = get_page();
+    var string poster = defined $c.poster ? _user_print($c.poster, "microformatted") : "<em>$*text_poster_anonymous</em>";
+    var string evenodd = $c.depth % 2 ? "odd" : "even";
+    if (defined $c.userpic and $*comment_userpic_style != "off") {
+        var int w = $c.userpic.width;
+        var int h = $c.userpic.height;
+        """<div class="comment-head $evenodd"><div class="comment-upic"><img src="$c.userpic.url" width="$w" height="$h" alt="$c.userpic.alttext" /></div>""";
+    } else {
+        """<div class="comment-head $evenodd cwoup">""";
+    }
+    """<div class="comment-head-in">""";
+    if (defined $c.subject_icon or $c.subject != "") {
+        """<h3>$c.subject_icon $c.subject</h3>""";
+    }
+    """<p>$poster <a class="comment-permalink" href="$c.permalink_url">""" + $c->time_display() +    "</a>";
+    if ($this.multiform_on) {
+        print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check</label>""";
+        $c->print_multiform_check();
+    }
+    $c->print_linkbar();
+    if ($c.metadata{"poster_ip"}) { " (" + $c.metadata{"poster_ip"} + ")"; }
+    "</p>";
+    "</div></div>";
+
+    """<div class="comment-text""" + (defined $c.userpic and $*comment_userpic_style != "off" ? "" : " comment-text-cwoup") + """\">"""; $c->print_text(); "</div>";
+    """<div class="comment-menu">""";
+    """<ul>""";
+    if ($c.frozen) {
+        print safe "<li>$*text_comment_frozen</li>";
+    } elseif($c.screened) {
+        var Link link = $c->get_link("unscreen_to_reply");
+        """<li><a class="unscreen-to-reply" href="$link.url" title="$link.caption">$link.caption</a></li>""";
+    } elseif ((not $c.spam) or ($p.showspam)) {
+        """<li>"""; $c->print_reply_link({"linktext" => $*text_comment_reply}); """</li>""";
+    }
+    if ($c.parent_url != "") { print safe """<li><a href="$c.parent_url">$*text_comment_parent</a></li>"""; }
+    if (($c.thread_url != "") and (not $c.spam)) {
+        print safe """<li><a href="$c.thread_url">$*text_comment_thread</a></li>""";
+        """<li>"""; $c->print_expand_collapse_links(); """</li>""";
+    }
+    """</ul>""";
+    """</div><div class="hr"><hr /></div>""";
+}

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -1212,7 +1212,7 @@
             if ($p.showspam) {
                 """ | """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span>""";
             } else {
-                """ | <a href=\"$e.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
+                """ | <a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></span>""";
             }
         }
         if ( $p.view != "entry" and $p.view != "reply" ) {
@@ -1298,7 +1298,7 @@
         print safe "$*text_max_comments";
     } else {
             var string target = "topcomment";
-                $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});
     }
 }

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -978,7 +978,7 @@
     $sidebar = $sidebar + """<div class="EntryComments">""";
     if ($e.comments.enabled) {
         if (($e.comments.count > 0 or $e.comments.screened) and $.view != "entry") {
-            $sidebar = $sidebar + """<a href="$e.comments.read_url#$*text_comments_id">""" +
+            $sidebar = $sidebar + """<a href="$e.comments.read_url">""" +
                 get_plural_phrase($e.comments.count, $.view == "friends" ?
                               "text_read_comments_friends" : "text_read_comments") +
             "</a>";
@@ -986,14 +986,14 @@
             $sidebar = $sidebar + "<br />";
         }
         if ($.view != "reply") {
-            $sidebar = $sidebar + """<a href="$e.comments.post_url#$*text_addcomment_id">""" +
+            $sidebar = $sidebar + """<a href="$e.comments.post_url">""" +
               ($.view == "friends" ? $*text_post_comment_friends : $*text_post_comment) + "</a><br />";
         }
         if (($e.comments.spam_counter > 0 or $e.comments.screened) and $.view == "entry" and $e.comments.read_spam_url != "") {
             if ($p.showspam) {
                   $sidebar = $sidebar + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """<br />""";
             } else {
-                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url#$*text_comments_id\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a><br />""";
+                  $sidebar = $sidebar + """<a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a><br />""";
             }
         }
     }
@@ -1284,7 +1284,7 @@
       $return = $return + "<b>[Page $i]</b><br />";
     } else {
       var string url_of = $.comment_pages->url_of($i);
-      $return = $return + """<a href="$url_of#$*text_comments_id" class="link"><b>[Page $i]</b></a><br />""";
+      $return = $return + """<a href="$url_of" class="link"><b>[Page $i]</b></a><br />""";
     }
   }
   return $return;

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-06-04 15:32:42 UTC (rev 12058)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-06-05 07:48:47 UTC (rev 12059)
@@ -1976,11 +1976,11 @@
     if ($.entry.comments.enabled and ($.comment_pages.total_subitems > 0 or $.entry.comments.spam_counter > 0)) {
         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");
 	    }
@@ -2000,7 +2000,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 = "";
@@ -2014,7 +2014,7 @@
               <div class="comments-nav">
                 ( $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 }); 
 	}
 	""" ) """;
     $this->print_reply_container({"target" => "topcomment"});
@@ -2048,7 +2048,7 @@
               <div class="comments-nav">
                 ( $comments_count $comments_showspam""";
 	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"});
@@ -2121,7 +2121,7 @@
     if ($.screened) {
         $show_screened = " <b>$*text_month_screened_comments</b>";
     }
-    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")+
                           "$show_screened</a>";
@@ -2130,9 +2130,9 @@
 function CommentInfo::print_postlink() {
     var Page p = get_page();
         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>";
        }
 }
 
@@ -2528,7 +2528,7 @@
     <h2 id="$*text_addcomment_id" class="comments-header page-header2">$*text_replyform_header</h2>
     <div class="comments-body">""";
       print $.entry.comments.count > 0 ? ("""<div class="comments-nav">
-        ( <a href="$.entry.permalink_url#$*text_comments_id">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
+        ( <a href="$.entry.permalink_url">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
       </div>""") : "";
       """<a name="replyform"></a>
       <div class="replyform">""";
@@ -2536,7 +2536,7 @@
     $.form->print();
 
     print $.entry.comments.count > 0 ? ("""<div class="comments-nav">
-          ( <a href="$.entry.permalink_url#$*text_comments_id">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
+          ( <a href="$.entry.permalink_url">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
         </div>""") : "";
       """</div>
     </div>""";

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