Committer: esavintcev
LJSUP-10959: Add "View classic comments" minimalism settingU trunk/bin/upgrading/s2layers/sup/layout.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/layout.s2 2012-01-20 07:43:13 UTC (rev 11335) +++ trunk/bin/upgrading/s2layers/sup/layout.s2 2012-01-20 12:21:24 UTC (rev 11336) @@ -1061,7 +1061,7 @@ $this->print_reply_container({ "target" => "topcomment" }); if ($.comment_pages.total_subitems > 0) { - $.comment_pages->print(); + """<div class="comments-pages">""";$.comment_pages->print();"""</div>"""; $this->print_multiform_start(); $this->print_comments($.comments); """<div class="comments-links">( $comments_count $comments_showspam"""; @@ -1073,7 +1073,7 @@ if ($.comment_pages.all_subitems_displayed) { """<div class="hr"><hr /></div>"""; } $this->print_multiform_actionline(); $this->print_multiform_end(); - $.comment_pages->print(); + """<div class="comments-pages">""";$.comment_pages->print();"""</div>"""; } """ @@ -1549,20 +1549,41 @@ } 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>"""; + + if ($*old_s1) { + """<div class="comment-head-in">"""; + if (defined $c.subject_icon or $c.subject != "") { + """<h3>$c.subject_icon $c.subject</h3>"""; + } + "<p>$poster</p>"; + "<p>" + $c->time_display(); + if ($c.metadata{"poster_ip"}) { " (" + $c.metadata{"poster_ip"} + ") "; } + """ (<a class="comment-permalink" href="$c.permalink_url">$*text_permalink</a>) """; + $c->print_linkbar(); + if ($this.multiform_on) { + $c->print_multiform_check(); + print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check_clean</label>"""; + } + "</p>"; + "</div>"; + } else { + """<div class="comment-head-in">"""; + if (defined $c.subject_icon or $c.subject != "") { + """<h3>$c.subject_icon $c.subject</h3>"""; + } + "<p>$poster</p>"; + """<p><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(); + "</p>"; + if ($c.metadata{"poster_ip"}) { "<p>(" + $c.metadata{"poster_ip"} + ")</p>"; } + "</div>"; } - "<p>$poster</p>"; - """<p><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(); - "</p>"; - if ($c.metadata{"poster_ip"}) { "<p>(" + $c.metadata{"poster_ip"} + ")</p>"; } - "</div></div>"; + + "</div>"; """<div class="comment-text">"""; $c->print_text(); "</div>"; """<div class="comment-menu">""";