Show screened/frozen status for collapsed comments in site scheme. Show
frozen status for all comments in S2 (screened was already available)
Patch by 900degrees.
diffs (52 lines):
diff -r 7ee6b18ea616 -r c5b7c98ec75e bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2 Mon Mar 08 01:53:58 2010 +0800
+++ b/bin/upgrading/s2layers/core2.s2 Mon Mar 08 02:17:14 2010 +0800
@@ -2477,6 +2477,11 @@ property string text_screened {
example = "(screened) ";
}
+property string text_frozen {
+ des = "The text used when a comment is frozen";
+ example = "(frozen) ";
+}
+
property string text_poster_anonymous {
des = "The placeholder used when something is posted by an anonymous user";
example = "(Anonymous)";
@@ -2509,6 +2514,7 @@ property string text_website_default_nam
property string text_website_default_name { noui = 1; des = "If an account's
website is specified, but there's no website name, use this text instead"; }
set text_screened = "(screened) ";
+set text_frozen = "(frozen) ";
set text_poster_anonymous = "(Anonymous)";
set text_openid_from = "from";
set text_reply_back = "Read Comments";
@@ -4149,6 +4155,9 @@ function EntryLite::print_subject( strin
"""<div class="comment-title">""";
if ($c.screened) {
print $*text_screened;
+ }
+ if ($c.frozen) {
+ print $*text_frozen;
}
print $this->formatted_subject( $opts );
"</div>";
diff -r 7ee6b18ea616 -r c5b7c98ec75e htdocs/talkread.bml
--- a/htdocs/talkread.bml Mon Mar 08 01:53:58 2010 +0800
+++ b/htdocs/talkread.bml Mon Mar 08 02:17:14 2010 +0800
@@ -756,7 +756,14 @@ body<=
my $url = LJ::Talk::talkargs( $talkurl, "thread=$dtid",
$style_args ) . LJ::Talk::comment_anchor( $dtid );
$ret .= "<a name='$htmlid'></a><span id='$htmlid'><table
><tbody><tr>";
$ret .= "<td><img src='$LJ::IMGPREFIX/dot.gif' height='1'
width='" . ($opts->{'depth'} * 25) . "'></td>";
- $ret .= "<td><a href='$url'>" . LJ::ehtml($post->{'subject'}
|| $T{'nosubject'}) . "</a> - $user, <i>$datepost</i>";
+ $ret .= "<td>";
+ if ($post->{'state'} eq 'S') {
+ $ret .= "($T{'screened'}) ";
+ }
+ if ($post->{'state'} eq 'F') {
+ $ret .= "($T{'frozen'}) ";
+ }
+ $ret .= "<a href='$url'>" . LJ::ehtml($post->{'subject'} ||
$T{'nosubject'}) . "</a> - $user, <i>$datepost</i>";
$ret .= qq[ (<a href='$url'
onClick="Expander.make(this,'$url','$dtid',true);return
false;">$T{'expand'}</a>)] if $show_thread_expander;
# Comment Posted Notice
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
