http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61320
Revision: 61320
Author: aaron
Date: 2010-01-21 00:20:27 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Added stability log excerpt back to review form, but hidden by default
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FRCacheUpdate.php
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/client/flaggedrevs.js
trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
Modified: trunk/extensions/FlaggedRevs/FRCacheUpdate.php
===================================================================
--- trunk/extensions/FlaggedRevs/FRCacheUpdate.php 2010-01-21 00:00:20 UTC
(rev 61319)
+++ trunk/extensions/FlaggedRevs/FRCacheUpdate.php 2010-01-21 00:20:27 UTC
(rev 61320)
@@ -1,5 +1,9 @@
<?php
-
+/**
+ * Class containing cache update methods and job construction
+ * for the special case of purging pages due to links contained
+ * only in the stable version of pages
+ */
class FRCacheUpdate {
public $mTitle, $mTable;
public $mRowsPerJob, $mRowsPerQuery;
Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-01-21 00:00:20 UTC
(rev 61319)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-01-21 00:20:27 UTC
(rev 61320)
@@ -737,7 +737,7 @@
$items = array();
$tag = $warning = $prot = '';
# Show stabilization log
- $log = $this->stabilityLogExcerpt();
+ $log = $this->stabilityLogNotice();
if ( $log ) $items[] = $log;
# Check the newest stable version
$quality = 0;
@@ -825,7 +825,7 @@
return true;
}
- protected function stabilityLogExcerpt() {
+ protected function stabilityLogNotice() {
$this->load();
$s = '';
# Only for pages manually made to be stable...
@@ -1594,8 +1594,15 @@
}
# Add the submit buttons
$form .= FlaggedRevsXML::ratingSubmitButtons( $frev,
(bool)$toggle, $allowRereview );
-
+ # Show stability log if there is anything interesting...
+ if( $this->article->isPageLocked() ) {
+ $form .= ' ' . FlaggedRevsXML::logToggle();
+ }
$form .= Xml::closeElement( 'span' );
+ # ..add the actual stability log body here
+ if( $this->article->isPageLocked() ) {
+ $form .= FlaggedRevsXML::stabilityLogExcerpt(
$this->article );
+ }
$form .= Xml::closeElement( 'div' ) . "\n";
# Hidden params
Modified: trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-01-21 00:00:20 UTC
(rev 61319)
+++ trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-01-21 00:20:27 UTC
(rev 61320)
@@ -1,5 +1,8 @@
<?php
-
+/**
+ * Class containing utility XML functions for a FlaggedRevs.
+ * Includes functions for selectors, icons, notices, CSS, and form aspects.
+ */
class FlaggedRevsXML {
/**
* Get a selector of reviewable namespaces
@@ -242,7 +245,7 @@
$box .= "</td><td></td></tr></table>";
return $box;
}
-
+
/**
* @returns string
* Generates (+/-) JS toggle HTML
@@ -253,7 +256,7 @@
wfMsgHtml( 'revreview-toggle-title' ) . '" >' .
wfMsgHtml( 'revreview-toggle' ) . '</a>';
}
-
+
/**
* @returns string
* Generates (+/-) JS toggle HTML
@@ -264,6 +267,17 @@
wfMsgHtml( 'revreview-diff-toggle-title' ) . '" >' .
wfMsgHtml( 'revreview-diff-toggle-show' ) . '</a>';
}
+
+ /**
+ * @returns string
+ * Generates (+/-) JS toggle HTML
+ */
+ public static function logToggle() {
+ return '<a id="mw-fr-logtoggle" class="flaggedrevs_toggle"
style="display:none;"' .
+ ' onclick="FlaggedRevs.toggleLog()" title="' .
+ wfMsgHtml( 'revreview-log-toggle-show' ) . '" >' .
+ wfMsgHtml( 'revreview-log-toggle-show' ) . '</a>';
+ }
/**
* @param array $flags, selected flags
@@ -481,4 +495,16 @@
$tag = wfMsgExt( $msg, array( 'parseinline' ),
$frev->getRevId(), $time, $revsSince );
return $tag;
}
+
+ /*
+ * @param Article $article
+ * @returns string
+ * Creates a stability log excerpt
+ */
+ public static function stabilityLogExcerpt( $article ) {
+ $logHtml = '';
+ LogEventsList::showLogExtract( $logHtml, 'stable',
+ $article->getTitle()->getPrefixedText(), '', array(
'lim' => 1 ) );
+ return "<div id=\"mw-fr-logexcerpt\">$logHtml</div>";
+ }
}
Modified: trunk/extensions/FlaggedRevs/client/flaggedrevs.js
===================================================================
--- trunk/extensions/FlaggedRevs/client/flaggedrevs.js 2010-01-21 00:00:20 UTC
(rev 61319)
+++ trunk/extensions/FlaggedRevs/client/flaggedrevs.js 2010-01-21 00:20:27 UTC
(rev 61320)
@@ -25,6 +25,14 @@
diff.style.display = 'none';
}
}
+ toggle = document.getElementById('mw-fr-logtoggle');
+ if( toggle ) {
+ toggle.style.display = 'inline';
+ var log = document.getElementById('mw-fr-logexcerpt');
+ if( log ) {
+ log.style.display = 'none';
+ }
+ }
},
/* Toggles ratings */
@@ -54,6 +62,19 @@
toggle.innerHTML =
this.messages.revreviewDiffToggleShow;
}
}
+ },
+
+ /* Toggles log excerpts */
+ 'toggleLog': function() {
+ var log = document.getElementById('mw-fr-logexcerpt');
+ if( !log ) return;
+ var toggle = document.getElementById('mw-fr-logtoggle');
+ if( log.style.display == 'none' ) {
+ log.style.display = 'inline';
+ if( toggle ) {
+ toggle.innerHTML = '';
+ }
+ }
}
};
Modified: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-01-21
00:00:20 UTC (rev 61319)
+++ trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-01-21
00:20:27 UTC (rev 61320)
@@ -52,6 +52,7 @@
'revreview-diff-toggle-show' => '(show changes)',
'revreview-diff-toggle-hide' => '(hide changes)',
'revreview-diff-toggle-title' => 'Toggle display of changes between
draft and the published version',
+ 'revreview-log-toggle-show' => '(show stability log)',
'review-diff2stable' => 'View pending changes to published
version',
'review-logentry-app' => 'reviewed a version of [[$1]]',
'review-logentry-dis' => 'deprecated a version of [[$1]]',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
