Committer: mchervonniy
LJSUP-9393: Expand Collapse links, new implementation with template in functionU trunk/bin/upgrading/s2layers/classic/layout.s2 U trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 U trunk/bin/upgrading/s2layers/generator/layout.s2 U trunk/bin/upgrading/s2layers/magazine/layout.s2 U trunk/bin/upgrading/s2layers/punquin/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
Modified: trunk/bin/upgrading/s2layers/classic/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/classic/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/classic/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -981,7 +981,7 @@ var string subj = $c.subject != "" ? $c.subject : $*text_nosubject; print safe "<a href='$c.permalink_url'>$subj</a> - $poster"; if ($c.thread_url != "") { - " - "; $c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"}); } } @@ -1073,7 +1073,7 @@ if ($c.thread_url != "" and $c.spam == false) { "(<a href='$c.thread_url'>Thread</a>) "; if ($c.parent_url != "" and size $c.replies > 0) { - "("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>"(%_)", "collapse"=>"(%_)"}); } } Modified: trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -1372,7 +1372,7 @@ if ($c.thread_url != "" and (not $c.spam)) { println """(<a href="$c.thread_url">Thread</a>) """; if ($c.parent_url != "" and size $c.replies > 0) { - "("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "}); } } if (not $c.frozen) { @@ -1386,7 +1386,7 @@ var string subj = $c.subject != "" ? $c.subject : $*text_nosubject; print safe "<a href='$c.permalink_url'>$subj</a> - $poster"; if ($c.thread_url) { - " ("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>" (%_) ", "collapse"=>" (%_) "}); } } Modified: trunk/bin/upgrading/s2layers/generator/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/generator/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/generator/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -1349,7 +1349,7 @@ var string poster = isnull $c.poster ? $*text_poster_anonymous : $c.poster->as_string(); print safe """<a href="$c.permalink_url">$subject</a> $poster"""; - " ";$c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" %_", "collapse"=>" %_"}); } function EntryPage::print_comment_full (Comment c) { var Page p = get_page(); @@ -1442,7 +1442,7 @@ if ($c.thread_url != "" and (not $c.spam)) { "(<a href='$c.thread_url'>Thread</a>) "; if ($c.parent_url != "" and size $c.replies > 0) { - "("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>"(%_)", "collapse"=>"(%_)"}); } } if (not $c.frozen) { Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/magazine/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/magazine/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -959,7 +959,7 @@ var string subj = $c.subject != "" ? $c.subject : $*text_nosubject; print safe "<a href='$c.permalink_url'>$subj</a> - $poster"; if ($c.thread_url != "") { - " ("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>" (%_) ", "collapse"=>" (%_) "}); } } @@ -1053,7 +1053,7 @@ if (($c.thread_url != "") and (not $c.spam)) { "(<a href='$c.thread_url'>Thread</a>) "; if ($c.parent_url != "" and size $c.replies > 0) { - "("; $c->print_expand_collapse_links(); ") "; + $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "}); } } if (not $c.frozen) { Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -893,7 +893,7 @@ var string subj = $c.subject != "" ? $c.subject : $*text_nosubject; print safe "<a href='$c.permalink_url'>$subj</a> - $poster"; if ($c.thread_url != "") { - " - "; $c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"}); } } @@ -989,7 +989,7 @@ # # "(" + $c->expand_link() + ") "; # # } if ($c.parent_url != "" and size $c.replies > 0) { - "("; $c->print_expand_collapse_links(); ") "; + $c->print_expand_collapse_links({ "expand"=>"(%_) ", "collapse"=>"(%_) "}); } } "</div>"; Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -1061,7 +1061,7 @@ "<a href='$e.permalink_url' class='collapsed-comment-link'>$subject</a> <span class='separator'>-</span> "; print safe lang_posted_by($e.poster, $e.poster); " <span class='separator'>-</span> "; print lang_posted_date_and_time($e, $e.time, true, true); - " $sep "; $e->print_expand_collapse_links(); + $e->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"}); "</div>"; "</div>"; } @@ -1107,7 +1107,7 @@ if (($e.thread_url != "") and (not $e.spam)) { print " $sep <a href='$e.thread_url'>$*text_comment_thread</a>"; if ($e.parent_url != "" and size $e.replies > 0) { - " $sep "; $e->print_expand_collapse_links(); + $e->print_expand_collapse_links({ "expand"=>" $sep %_", "collapse"=>" $sep %_"}); } } if (($e.reply_url != "") and ((not $e.spam) or ($p.showspam))) { Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -869,7 +869,7 @@ if ($c.thread_url != "" and (not $c.spam)) { """<a href="$c.thread_url">$*text_comment_thread</a> """; if ($c.parent_url != "" and size $c.replies > 0) { - " - "; $c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"}); } """ - """; } @@ -914,7 +914,7 @@ print """<div class="minicomment" id="$c.dom_id"><a href="$c.permalink_url">$subj</a> - $poster"""; var Link expand_link = $c->get_link("expand_comments"); if ($c.thread_url != "" and (not $c.spam)) { - " - "; $c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"}); } print """</div>"""; } Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/tabularindent/layout.s2 2011-09-02 09:37:44 UTC (rev 19949) +++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2 2011-09-02 10:24:01 UTC (rev 19950) @@ -571,7 +571,7 @@ ") "; } if ($c.thread_url != "" and (not $c.spam) and $c.parent_url != "" and size $c.replies > 0) { - " ("; $c->print_expand_collapse_links(); ")"; + $c->print_expand_collapse_links({ "expand"=>"%_", "collapse"=>"%_"}); } if (not $c.frozen) { @@ -1065,7 +1065,7 @@ print_genericbox_open(); print "<a href='$c.permalink_url'>$subj</a> - $poster"; if ($c.thread_url != "") { - " - "; $c->print_expand_collapse_links(); + $c->print_expand_collapse_links({ "expand"=>" - %_", "collapse"=>" - %_"}); } print_genericbox_close(); }