http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76835
Revision: 76835
Author: pdhanda
Date: 2010-11-16 20:51:19 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
Changed the revcontents-getcontents message as per feedback from r76353. Added
a notice when viewing the pending version - bug 25299. Changed edit notice
styles to match.
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/client/flaggedrevs.css
trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-11-16 20:47:53 UTC
(rev 76834)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-11-16 20:51:19 UTC
(rev 76835)
@@ -385,9 +385,8 @@
$quality = FlaggedRevs::isQuality( $flags );
# Get stable version sync status
$synced = $this->article->stableVersionIsSynced();
- if ( $synced ) {
- $this->setReviewNotes( $srev ); // Still the same
- } else {
+ $this->setReviewNotes( $srev, $synced ); // Still the same
+ if ( !$synced ) {
$this->maybeShowTopDiff( $srev, $quality ); // user may
want diff (via prefs)
}
# If they are synced, do special styling
@@ -1248,17 +1247,26 @@
* @param FlaggedRevision $frev
* @return string, revision review notes
*/
- public function setReviewNotes( $frev ) {
- global $wgUser;
+ public function setReviewNotes( $frev, $synced = true ) {
+ global $wgUser, $wgLang;
$this->load();
- if ( $frev && FlaggedRevs::allowComments() &&
$frev->getComment() != '' ) {
- $this->reviewNotes = "<br /><div
class='flaggedrevs_notes plainlinks'>";
- $this->reviewNotes .= wfMsgExt( 'revreview-note',
array( 'parseinline' ),
- User::whoIs( $frev->getUser() ) );
- $this->reviewNotes .= '<br /><i>' .
- $wgUser->getSkin()->formatComment(
$frev->getComment() ) . '</i></div>';
+
+ if ( $synced ) {
+ if ( $frev && FlaggedRevs::allowComments() &&
$frev->getComment() != '' ) {
+ $this->reviewNotes = "<br /><div
class='flaggedrevs_notes plainlinks'>";
+ $this->reviewNotes .= wfMsgExt(
'revreview-note', array( 'parseinline' ),
+ User::whoIs( $frev->getUser() ) );
+ $this->reviewNotes .= '<br /><i>' .
+ $wgUser->getSkin()->formatComment(
$frev->getComment() ) . '</i></div>';
+ }
+ } else {
+ $time = $wgLang->date( $frev->getTimestamp(), true );
+ $pendingNotice = wfMsgExt( 'revreview-pendingnotice',
array( 'parseinline' ), $time );
+ $this->reviewNotice = "<div id='mw-fr-reviewnotice' " .
+ "class='flaggedrevs_preview plainlinks'>" .
$pendingNotice . "</div>";
}
}
+
/**
* When viewing a diff:
Modified: trunk/extensions/FlaggedRevs/client/flaggedrevs.css
===================================================================
--- trunk/extensions/FlaggedRevs/client/flaggedrevs.css 2010-11-16 20:47:53 UTC
(rev 76834)
+++ trunk/extensions/FlaggedRevs/client/flaggedrevs.css 2010-11-16 20:51:19 UTC
(rev 76835)
@@ -32,7 +32,7 @@
table.flaggedrevs_editnotice,
table.flaggedrevs_viewnotice {
padding: 3px;
- border: 2px solid #aaa;
+ border: 2px solid #6cc8f3;
background-color: #f9f9f9;
text-align: left;
width: 100%;
@@ -41,7 +41,7 @@
div.flaggedrevs_diffnotice,
div.flaggedrevs_preview {
- border: 1px solid #aaa;
+ border: 1px solid #a7d7f9;
padding: 5px;
text-align: center;
clear: both;
@@ -51,8 +51,8 @@
background-color: #f9f9f9;
}
div.flaggedrevs_preview {
- background-color: #f9f9f9;
- color: #8b0000;
+ background-color: #eaf2fd;
+ color: black;
}
span.flaggedrevs_important {
Modified: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-11-16
20:47:53 UTC (rev 76834)
+++ trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-11-16
20:51:19 UTC (rev 76835)
@@ -42,7 +42,7 @@
'group-autoreview-member' => 'autochecked users',
'grouppage-autoreview' => '{{ns:project}}:Autochecked users',
'revcontents-error' => 'Unable to get content.',
- 'revcontents-getcontents' => 'Click <a href="$1" >here</a> to view
this revision.',
+ 'revcontents-getcontents' => '<a href="$1" >View this
revision</a>',
'revcontents-waiting' => 'Waiting for content',
'revreview-hist-draft' => 'unchecked revision',
'revreview-hist-pending' => 'pending revision',
@@ -112,6 +112,7 @@
'revreview-draft-title' => 'Pending changes are displayed on
this page',
'revreview-edit' => 'Edit',
'revreview-editnotice' => '\'\'\'Your changes will be displayed
to readers once an authorized user reviews them.
([[{{MediaWiki:Validationpage}}|help]])\'\'\'',
+ 'revreview-pendingnotice' => '\'\'\'This is a
[[w:Wikipedia:Pending changes|pending revision]] of this page. It was last
accepted at <i>$1</i>. It may differ slightly from the accepted
revision.\'\'\'',
'revreview-check-flag-p' => 'Accept this version (includes $1
pending {{PLURAL:$1|change|changes}})',
'revreview-check-flag-p-title' => 'Accept the result of the pending
changes and the changes you made here. Use this only if you have already seen
the entire pending changes diff.',
'revreview-check-flag-u' => 'Accept this unreviewed page',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
