| Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | 'group-autoreview-member' => 'autochecked users', |
| 44 | 44 | 'grouppage-autoreview' => '{{ns:project}}:Autochecked users', |
| 45 | 45 | 'revcontents-error' => 'Unable to get content.', |
| 46 | | - 'revcontents-getcontents' => 'Click <a href="$1" >here</a> to view this revision.', |
| | 46 | + 'revcontents-getcontents' => '<a href="$1" >View this revision</a>', |
| 47 | 47 | 'revcontents-waiting' => 'Waiting for content', |
| 48 | 48 | 'revreview-hist-draft' => 'unchecked revision', |
| 49 | 49 | 'revreview-hist-pending' => 'pending revision', |
| — | — | @@ -112,6 +112,7 @@ |
| 113 | 113 | 'revreview-draft-title' => 'Pending changes are displayed on this page', |
| 114 | 114 | 'revreview-edit' => 'Edit', |
| 115 | 115 | 'revreview-editnotice' => '\'\'\'Your changes will be displayed to readers once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\'', |
| | 116 | + '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.\'\'\'', |
| 116 | 117 | 'revreview-check-flag-p' => 'Accept this version (includes $1 pending {{PLURAL:$1|change|changes}})', |
| 117 | 118 | '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.', |
| 118 | 119 | 'revreview-check-flag-u' => 'Accept this unreviewed page', |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -385,9 +385,8 @@ |
| 386 | 386 | $quality = FlaggedRevs::isQuality( $flags ); |
| 387 | 387 | # Get stable version sync status |
| 388 | 388 | $synced = $this->article->stableVersionIsSynced(); |
| 389 | | - if ( $synced ) { |
| 390 | | - $this->setReviewNotes( $srev ); // Still the same |
| 391 | | - } else { |
| | 389 | + $this->setReviewNotes( $srev, $synced ); // Still the same |
| | 390 | + if ( !$synced ) { |
| 392 | 391 | $this->maybeShowTopDiff( $srev, $quality ); // user may want diff (via prefs) |
| 393 | 392 | } |
| 394 | 393 | # If they are synced, do special styling |
| — | — | @@ -1248,17 +1247,26 @@ |
| 1249 | 1248 | * @param FlaggedRevision $frev |
| 1250 | 1249 | * @return string, revision review notes |
| 1251 | 1250 | */ |
| 1252 | | - public function setReviewNotes( $frev ) { |
| 1253 | | - global $wgUser; |
| | 1251 | + public function setReviewNotes( $frev, $synced = true ) { |
| | 1252 | + global $wgUser, $wgLang; |
| 1254 | 1253 | $this->load(); |
| 1255 | | - if ( $frev && FlaggedRevs::allowComments() && $frev->getComment() != '' ) { |
| 1256 | | - $this->reviewNotes = "<br /><div class='flaggedrevs_notes plainlinks'>"; |
| 1257 | | - $this->reviewNotes .= wfMsgExt( 'revreview-note', array( 'parseinline' ), |
| 1258 | | - User::whoIs( $frev->getUser() ) ); |
| 1259 | | - $this->reviewNotes .= '<br /><i>' . |
| 1260 | | - $wgUser->getSkin()->formatComment( $frev->getComment() ) . '</i></div>'; |
| | 1254 | + |
| | 1255 | + if ( $synced ) { |
| | 1256 | + if ( $frev && FlaggedRevs::allowComments() && $frev->getComment() != '' ) { |
| | 1257 | + $this->reviewNotes = "<br /><div class='flaggedrevs_notes plainlinks'>"; |
| | 1258 | + $this->reviewNotes .= wfMsgExt( 'revreview-note', array( 'parseinline' ), |
| | 1259 | + User::whoIs( $frev->getUser() ) ); |
| | 1260 | + $this->reviewNotes .= '<br /><i>' . |
| | 1261 | + $wgUser->getSkin()->formatComment( $frev->getComment() ) . '</i></div>'; |
| | 1262 | + } |
| | 1263 | + } else { |
| | 1264 | + $time = $wgLang->date( $frev->getTimestamp(), true ); |
| | 1265 | + $pendingNotice = wfMsgExt( 'revreview-pendingnotice', array( 'parseinline' ), $time ); |
| | 1266 | + $this->reviewNotice = "<div id='mw-fr-reviewnotice' " . |
| | 1267 | + "class='flaggedrevs_preview plainlinks'>" . $pendingNotice . "</div>"; |
| 1261 | 1268 | } |
| 1262 | 1269 | } |
| | 1270 | + |
| 1263 | 1271 | |
| 1264 | 1272 | /** |
| 1265 | 1273 | * When viewing a diff: |
| Index: trunk/extensions/FlaggedRevs/client/flaggedrevs.css |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | table.flaggedrevs_editnotice, |
| 34 | 34 | table.flaggedrevs_viewnotice { |
| 35 | 35 | padding: 3px; |
| 36 | | - border: 2px solid #aaa; |
| | 36 | + border: 2px solid #6cc8f3; |
| 37 | 37 | background-color: #f9f9f9; |
| 38 | 38 | text-align: left; |
| 39 | 39 | width: 100%; |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | |
| 43 | 43 | div.flaggedrevs_diffnotice, |
| 44 | 44 | div.flaggedrevs_preview { |
| 45 | | - border: 1px solid #aaa; |
| | 45 | + border: 1px solid #a7d7f9; |
| 46 | 46 | padding: 5px; |
| 47 | 47 | text-align: center; |
| 48 | 48 | clear: both; |
| — | — | @@ -51,8 +51,8 @@ |
| 52 | 52 | background-color: #f9f9f9; |
| 53 | 53 | } |
| 54 | 54 | div.flaggedrevs_preview { |
| 55 | | - background-color: #f9f9f9; |
| 56 | | - color: #8b0000; |
| | 55 | + background-color: #eaf2fd; |
| | 56 | + color: black; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | span.flaggedrevs_important { |