Committer: mchervonniy
LJSUP-8809: new thread expander, 3 column, deleted comments U trunk/bin/upgrading/s2layers/3column/layout.s2
Modified: trunk/bin/upgrading/s2layers/3column/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/3column/layout.s2 2011-05-12 07:59:10 UTC (rev 10499) +++ trunk/bin/upgrading/s2layers/3column/layout.s2 2011-05-12 08:11:59 UTC (rev 10500) @@ -537,15 +537,19 @@ if (size $cs == 0) { return; } foreach var Comment c ($cs) { $this->print_comment($c); + """<div class="comment_child">"""; + $this->print_comments($c.replies); + """</div>"""; } } function EntryPage::print_comment(Comment c) { var Page p = get_page(); + var string indent = ($c.depth - 1) * 25 + "px"; if ($c.screened and not $c.full and not viewer_is_owner()) { """<strong>$*text_comment_screened</strong>"""; } elseif ($c.deleted) { - """<strong>$*text_comment_deleted</strong>"""; + """<div class="entry" style="margin-left:$indent;"><div class="minicomment"><strong>$*text_comment_deleted</strong></div></div>"""; } elseif (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) { """<div class="comment_wrapper"><div class="entrytext"><strong>$*text_spam_comment</strong></div></div>"""; } elseif ($c.full) { @@ -645,17 +649,17 @@ """ </div></div> """; - if ((size $c.replies) > 0 and $c.replies[0].full == false) { + ### if ((size $c.replies) > 0 and $c.replies[0].full == false) { ##"""<div class="comment_child">\n"""; - $this->print_comments($c.replies); + ### $this->print_comments($c.replies); ##"</div>\n"; - } + ### } - if ((size $c.replies) > 0 and $c.replies[0].full == true) { + ### if ((size $c.replies) > 0 and $c.replies[0].full == true) { ##"""<div class="comment_child">"""; - $this->print_comments($c.replies); + ### $this->print_comments($c.replies); ##"""</div>"""; - } + ### } } @@ -688,7 +692,7 @@ $c->print_expand_collapse_links(); } print """</div></div></div></div>"""; - $this->print_comments($c.replies); + ### $this->print_comments($c.replies); } function ItemRange::print() {