http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99202
Revision: 99202
Author: aaron
Date: 2011-10-07 09:26:00 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
* Separated out review.css file
* Moved module definitions to hooks class in /presentation
* Moved log action/UI definitions to hooks class in /presentation
* Changed defines.php include() to require() for sanity
* A few w/s cleanup
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
Added Paths:
-----------
trunk/extensions/FlaggedRevs/presentation/modules/review.css
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2011-10-07 08:48:25 UTC
(rev 99201)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2011-10-07 09:26:00 UTC
(rev 99202)
@@ -32,7 +32,7 @@
);
# Load global constants
-include_once( "FlaggedRevsDefines.php" );
+require( "FlaggedRevsDefines.php" );
# ######## Configuration variables ########
# IMPORTANT: DO NOT EDIT THIS FILE
@@ -118,19 +118,19 @@
# Define when users get automatically promoted to Editors. Set as false to
disable.
# Once users meet these requirements they will be promoted, unless previously
demoted.
$wgFlaggedRevsAutopromote = array(
- 'days' => 60, # days since registration
- 'edits' => 250, # total edit count
- 'excludeLastDays' => 1, # exclude the last X days of edits from
edit counts
- 'benchmarks' => 15, # number of "spread out" edits
- 'spacing' => 3, # number of days between these
edits (the "spread")
+ 'days' => 60, # days since registration
+ 'edits' => 250, # total edit count
+ 'excludeLastDays' => 1, # exclude the last X days of
edits from edit counts
+ 'benchmarks' => 15, # number of "spread out" edits
+ 'spacing' => 3, # number of days between
these edits (the "spread")
// Either totalContentEdits reqs OR totalCheckedEdits requirements
needed
'totalContentEdits' => 300, # edits to pages in $wgContentNamespaces
'totalCheckedEdits' => 200, # edits before the stable version of
pages
'uniqueContentPages' => 14, # unique pages in $wgContentNamespaces
edited
- 'editComments' => 50, # number of manual edit summaries used
- 'userpageBytes' => 0, # size of userpage (use 0 to not require
a userpage)
- 'neverBlocked' => true, # username was never blocked before?
- 'maxRevertedEditRatio' => .03, # max fraction of edits reverted via
"rollback"/"undo"
+ 'editComments' => 50, # number of manual edit
summaries used
+ 'userpageBytes' => 0, # size of userpage (use 0 to not
require a userpage)
+ 'neverBlocked' => true, # username was never blocked
before?
+ 'maxRevertedEditRatio' => .03, # max fraction of edits reverted via
"rollback"/"undo"
);
# Define when users get to have their own edits auto-reviewed. Set to false to
disable.
@@ -139,17 +139,17 @@
$wgFlaggedRevsAutoconfirm = false;
/* (example usage)
$wgFlaggedRevsAutoconfirm = array(
- 'days' => 30, # days since registration
- 'edits' => 50, # total edit count
- 'benchmarks' => 7, # number of "spread out" edits
- 'spacing' => 3, # number of days between these edits
(the "spread")
+ 'days' => 30, # days since registration
+ 'edits' => 50, # total edit count
+ 'benchmarks' => 7, # number of "spread out" edits
+ 'spacing' => 3, # number of days between
these edits (the "spread")
// Either totalContentEdits reqs OR totalCheckedEdits requirements
needed
- 'totalContentEdits' => 150, # $wgContentNamespaces edits OR...
- 'totalCheckedEdits' => 50, # ...Edits before the stable version of
pages
- 'uniqueContentPages' => 8, # $wgContentNamespaces unique pages edited
- 'editComments' => 20, # how many edit comments used?
- 'email' => false, # user must be emailconfirmed?
- 'neverBlocked' => true, # Can users that were blocked be
promoted?
+ 'totalContentEdits' => 150, # $wgContentNamespaces edits
OR...
+ 'totalCheckedEdits' => 50, # ...Edits before the stable
version of pages
+ 'uniqueContentPages' => 8, # $wgContentNamespaces unique pages edited
+ 'editComments' => 20, # how many edit comments used?
+ 'email' => false, # user must be
emailconfirmed?
+ 'neverBlocked' => true, # Can users that were blocked
be promoted?
);
*/
@@ -361,42 +361,17 @@
$wgDefaultUserOptions['flaggedrevseditdiffs'] = true;
$wgDefaultUserOptions['flaggedrevsviewdiffs'] = false;
+# Add review log
+$wgLogTypes[] = 'review';
+# Add stable version log
+$wgLogTypes[] = 'stable';
+
+# Log action handlers
+FlaggedRevsUIHooks::defineBasicLogUI( $wgLogNames, $wgLogHeaders,
$wgFilterLogTypes );
+FlaggedRevsUIHooks::defineLogActionHanders( $wgLogActions,
$wgLogActionsHandlers );
+
# JS/CSS modules and message bundles used by JS scripts
-$localModulePath = dirname( __FILE__ ) . '/presentation/modules/';
-$remoteModulePath = 'FlaggedRevs/presentation/modules';
-$wgResourceModules['ext.flaggedRevs.basic'] = array(
- 'styles' => array( 'flaggedrevs.css' ),
- 'localBasePath' => $localModulePath,
- 'remoteExtPath' => $remoteModulePath,
-);
-$wgResourceModules['ext.flaggedRevs.advanced'] = array(
- 'scripts' => array( 'flaggedrevs.js' ),
- 'messages' => array(
- 'revreview-toggle-show', 'revreview-toggle-hide',
- 'revreview-diff-toggle-show', 'revreview-diff-toggle-hide',
- 'revreview-log-toggle-show', 'revreview-log-toggle-hide',
- 'revreview-log-details-show', 'revreview-log-details-hide'
- ),
- 'dependencies' => array( 'mediawiki.util' ),
- 'localBasePath' => $localModulePath,
- 'remoteExtPath' => $remoteModulePath,
-);
-$wgResourceModules['ext.flaggedRevs.review'] = array(
- 'scripts' => array( 'review.js' ),
- 'messages' => array(
- 'savearticle', 'tooltip-save', 'accesskey-save',
- 'revreview-submitedit', 'revreview-submitedit-title',
- 'revreview-submit-review', 'revreview-submit-unreview',
- 'revreview-submit-reviewed', 'revreview-submit-unreviewed',
- 'revreview-submitting', 'actioncomplete', 'actionfailed',
- 'revreview-adv-reviewing-p', 'revreview-adv-reviewing-c',
- 'revreview-sadv-reviewing-p', 'revreview-sadv-reviewing-c',
- 'revreview-adv-start-link', 'revreview-adv-stop-link'
- ),
- 'dependencies' => array( 'mediawiki.util' ),
- 'localBasePath' => $localModulePath,
- 'remoteExtPath' => $remoteModulePath,
-);
+FlaggedRevsUIHooks::defineResourceModules( $wgResourceModules );
# ####### EVENT-HANDLER FUNCTIONS #########
@@ -674,31 +649,6 @@
$wgDefaultUserOptions['flaggedrevssimpleui'] =
(int)$wgSimpleFlaggedRevsUI;
}
-# Add review log
-$wgLogTypes[] = 'review';
-$wgFilterLogTypes['review'] = true;
-$wgLogNames['review'] = 'review-logpage';
-$wgLogHeaders['review'] = 'review-logpagetext';
-# Various actions are used for log filtering ...
-$wgLogActions['review/approve'] = 'review-logentry-app'; // checked (again)
-$wgLogActions['review/approve2'] = 'review-logentry-app'; // quality (again)
-$wgLogActions['review/approve-i'] = 'review-logentry-app'; // checked (first
time)
-$wgLogActions['review/approve2-i'] = 'review-logentry-app'; // quality (first
time)
-$wgLogActions['review/approve-a'] = 'review-logentry-app'; // checked (auto)
-$wgLogActions['review/approve2-a'] = 'review-logentry-app'; // quality (auto)
-$wgLogActions['review/approve-ia'] = 'review-logentry-app'; // checked
(initial & auto)
-$wgLogActions['review/approve2-ia'] = 'review-logentry-app'; // quality
(initial & auto)
-$wgLogActions['review/unapprove'] = 'review-logentry-dis'; // was checked
-$wgLogActions['review/unapprove2'] = 'review-logentry-dis'; // was quality
-
-# Add stable version log
-$wgLogTypes[] = 'stable';
-$wgLogNames['stable'] = 'stable-logpage';
-$wgLogHeaders['stable'] = 'stable-logpagetext';
-$wgLogActionsHandlers['stable/config'] =
'FlaggedRevsLogView::stabilityLogText'; // customize
-$wgLogActionsHandlers['stable/modify'] =
'FlaggedRevsLogView::stabilityLogText'; // re-customize
-$wgLogActionsHandlers['stable/reset'] =
'FlaggedRevsLogView::stabilityLogText'; // reset
-
# AJAX functions
$wgAjaxExportList[] = 'RevisionReview::AjaxReview';
$wgAjaxExportList[] = 'FlaggedPageView::AjaxBuildDiffHeaderItems';
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-10-07 08:48:25 UTC (rev 99201)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-10-07 09:26:00 UTC (rev 99202)
@@ -6,6 +6,7 @@
/*
* Register FlaggedRevs special pages as needed.
* Also sets $wgSpecialPages just to be consistent.
+ * @param $list Array List of special pages
*/
public static function defineSpecialPages( array &$list ) {
global $wgSpecialPages, $wgUseTagFilter;
@@ -37,6 +38,88 @@
}
/**
+ * Append FlaggedRevs resource module definitions
+ * @param $modules Array $wgResourceModules
+ */
+ public static function defineResourceModules( &$modules ) {
+ $localModulePath = dirname( __FILE__ ) . '/modules/';
+ $remoteModulePath = 'FlaggedRevs/presentation/modules';
+ $modules['ext.flaggedRevs.basic'] = array(
+ 'styles' => array( 'flaggedrevs.css' ),
+ 'localBasePath' => $localModulePath,
+ 'remoteExtPath' => $remoteModulePath,
+ );
+ $modules['ext.flaggedRevs.advanced'] = array(
+ 'scripts' => array( 'flaggedrevs.js' ),
+ 'messages' => array(
+ 'revreview-toggle-show',
'revreview-toggle-hide',
+ 'revreview-diff-toggle-show',
'revreview-diff-toggle-hide',
+ 'revreview-log-toggle-show',
'revreview-log-toggle-hide',
+ 'revreview-log-details-show',
'revreview-log-details-hide'
+ ),
+ 'dependencies' => array( 'mediawiki.util' ),
+ 'localBasePath' => $localModulePath,
+ 'remoteExtPath' => $remoteModulePath,
+ );
+ $modules['ext.flaggedRevs.review'] = array(
+ 'scripts' => array( 'review.js' ),
+ 'styles' => array( 'review.css' ),
+ 'messages' => array(
+ 'savearticle', 'tooltip-save', 'accesskey-save',
+ 'revreview-submitedit',
'revreview-submitedit-title',
+ 'revreview-submit-review',
'revreview-submit-unreview',
+ 'revreview-submit-reviewed',
'revreview-submit-unreviewed',
+ 'revreview-submitting', 'actioncomplete',
'actionfailed',
+ 'revreview-adv-reviewing-p',
'revreview-adv-reviewing-c',
+ 'revreview-sadv-reviewing-p',
'revreview-sadv-reviewing-c',
+ 'revreview-adv-start-link',
'revreview-adv-stop-link'
+ ),
+ 'dependencies' => array( 'mediawiki.util' ),
+ 'localBasePath' => $localModulePath,
+ 'remoteExtPath' => $remoteModulePath,
+ );
+ }
+
+ /**
+ * Append FlaggedRevs log names and set filterable logs
+ * @param $logNames Array $wgLogNames
+ * @param $logHeaders Array $wgLogHeaders
+ * @param $filterLogTypes Array $wgFilterLogTypes
+ */
+ public static function defineBasicLogUI( &$logNames, &$logHeaders,
&$filterLogTypes ) {
+ $logNames['review'] = 'review-logpage';
+ $logHeaders['review'] = 'review-logpagetext';
+
+ $logNames['stable'] = 'stable-logpage';
+ $logHeaders['stable'] = 'stable-logpagetext';
+
+ $filterLogTypes['review'] = true;
+ }
+
+ /**
+ * Append FlaggedRevs log action handlers
+ * @param $logActions Array $wgLogActions
+ * @param $logActionsHandlers Array $wgLogActionsHandlers
+ */
+ public static function defineLogActionHanders( &$logActions,
&$logActionsHandlers ) {
+ # Various actions are used for log filtering ...
+ $logActions['review/approve'] = 'review-logentry-app'; //
checked (again)
+ $logActions['review/approve2'] = 'review-logentry-app'; //
quality (again)
+ $logActions['review/approve-i'] = 'review-logentry-app'; //
checked (first time)
+ $logActions['review/approve2-i'] = 'review-logentry-app'; //
quality (first time)
+ $logActions['review/approve-a'] = 'review-logentry-app'; //
checked (auto)
+ $logActions['review/approve2-a'] = 'review-logentry-app'; //
quality (auto)
+ $logActions['review/approve-ia'] = 'review-logentry-app'; //
checked (initial & auto)
+ $logActions['review/approve2-ia'] = 'review-logentry-app'; //
quality (initial & auto)
+ $logActions['review/unapprove'] = 'review-logentry-dis'; // was
checked
+ $logActions['review/unapprove2'] = 'review-logentry-dis'; //
was quality
+
+ $logActionsHandlers['stable/config'] =
'FlaggedRevsLogView::stabilityLogText'; // customize
+ $logActionsHandlers['stable/modify'] =
'FlaggedRevsLogView::stabilityLogText'; // re-customize
+ $logActionsHandlers['stable/reset'] =
'FlaggedRevsLogView::stabilityLogText'; // reset
+ }
+
+ /**
* Add FlaggedRevs css/js.
*/
protected static function injectStyleAndJS() {
Modified: trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
2011-10-07 08:48:25 UTC (rev 99201)
+++ trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
2011-10-07 09:26:00 UTC (rev 99202)
@@ -309,47 +309,3 @@
#mw-fr-stablediff {
background-color: white;
}
-
-/* Review form */
-.flaggedrevs_reviewform {
- background-color: #f9f9f9;
- font-size: 90%;
- clear: both;
-}
-
-.fr-rating-controls,
-.fr-rating-controls-disabled {
- vertical-align: middle;
-}
-
-.fr-rating-controls-disabled {
- color: GrayText;
-}
-
-#mw-fr-confirmreview {
- white-space: nowrap;
-}
-.fr-rating-options {
- margin-right: 1.5em;
- white-space: nowrap;
-}
-
-.fr-rating-option-0 {
- background-color: #f5ecec;
-}
-.fr-rating-option-1 {
- background-color: #f0f8ff;
-}
-.fr-rating-option-2 {
- background-color: #e1ffe1;
-}
-.fr-rating-option-3 {
- background-color: #fef0db;
-}
-.fr-rating-option-4 {
- background-color: #ffffe3;
-}
-
-#mw-fr-commentbox {
- margin-right: 1.5em;
-}
Added: trunk/extensions/FlaggedRevs/presentation/modules/review.css
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/review.css
(rev 0)
+++ trunk/extensions/FlaggedRevs/presentation/modules/review.css
2011-10-07 09:26:00 UTC (rev 99202)
@@ -0,0 +1,48 @@
+/**
+ * FlaggedRevs Stylesheet
+ * @author Aaron Schulz
+ */
+
+/* Review form */
+.flaggedrevs_reviewform {
+ background-color: #f9f9f9;
+ font-size: 90%;
+ clear: both;
+}
+
+.fr-rating-controls,
+.fr-rating-controls-disabled {
+ vertical-align: middle;
+}
+
+.fr-rating-controls-disabled {
+ color: GrayText;
+}
+
+#mw-fr-confirmreview {
+ white-space: nowrap;
+}
+.fr-rating-options {
+ margin-right: 1.5em;
+ white-space: nowrap;
+}
+
+.fr-rating-option-0 {
+ background-color: #f5ecec;
+}
+.fr-rating-option-1 {
+ background-color: #f0f8ff;
+}
+.fr-rating-option-2 {
+ background-color: #e1ffe1;
+}
+.fr-rating-option-3 {
+ background-color: #fef0db;
+}
+.fr-rating-option-4 {
+ background-color: #ffffe3;
+}
+
+#mw-fr-commentbox {
+ margin-right: 1.5em;
+}
Property changes on:
trunk/extensions/FlaggedRevs/presentation/modules/review.css
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
