From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- resources/Resources.php | 220 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 173 insertions(+), 47 deletions(-) (limited to 'resources/Resources.php') diff --git a/resources/Resources.php b/resources/Resources.php index 6205bb91..06120008 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -20,7 +20,7 @@ * @file */ -if( !defined( 'MEDIAWIKI' ) ) { +if ( !defined( 'MEDIAWIKI' ) ) { die( 'Not an entry point.' ); } @@ -60,14 +60,11 @@ return array( * * See Vector for an example. */ - - 'skins.chick' => array( - 'styles' => array( 'chick/main.css' => array( 'media' => 'screen, handheld' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), 'skins.cologneblue' => array( - 'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ), + 'styles' => array( + 'cologneblue/screen.css' => array( 'media' => 'screen' ), + 'cologneblue/print.css' => array( 'media' => 'print' ), + ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), @@ -102,37 +99,53 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), - 'skins.nostalgia' => array( - 'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), - 'skins.simple' => array( - 'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), - 'skins.standard' => array( - 'styles' => array( 'standard/main.css' => array( 'media' => 'screen' ) ), + 'skins.vector' => array( + // Used in the web installer. Test it after modifying this definition! + 'styles' => array( + 'common/commonElements.css' => array( 'media' => 'screen' ), + 'common/commonContent.css' => array( 'media' => 'screen' ), + 'common/commonInterface.css' => array( 'media' => 'screen' ), + 'vector/styles.less', + ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), - 'skins.vector' => array( - // Keep in sync with WebInstallerOutput::getCSS() + 'skins.vector.beta' => array( + // Keep in sync with skins.vector 'styles' => array( 'common/commonElements.css' => array( 'media' => 'screen' ), 'common/commonContent.css' => array( 'media' => 'screen' ), 'common/commonInterface.css' => array( 'media' => 'screen' ), - 'vector/screen.css' => array( 'media' => 'screen' ), - 'vector/screen-hd.css' => array( 'media' => 'screen and (min-width: 982px)' ), + 'vector/styles-beta.less', ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), 'skins.vector.js' => array( - 'scripts' => 'vector/vector.js', + 'scripts' => array( + 'vector/collapsibleTabs.js', + 'vector/vector.js', + ), + 'position' => 'top', + 'dependencies' => 'jquery.delayedBind', + 'remoteBasePath' => $GLOBALS['wgStylePath'], + 'localBasePath' => $GLOBALS['wgStyleDirectory'], + ), + 'skins.vector.collapsibleNav' => array( + 'scripts' => array( + 'vector/collapsibleNav.js', + ), + 'messages' => array( + 'vector-collapsiblenav-more', + ), + 'dependencies' => array( + 'jquery.client', + 'jquery.cookie', + 'jquery.tabIndex', + ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], + 'position' => 'bottom', ), /* jQuery */ @@ -166,6 +179,7 @@ return array( ), 'jquery.byteLength' => array( 'scripts' => 'resources/jquery/jquery.byteLength.js', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.byteLimit' => array( 'scripts' => 'resources/jquery/jquery.byteLimit.js', @@ -173,6 +187,11 @@ return array( ), 'jquery.checkboxShiftClick' => array( 'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js', + 'targets' => array( 'desktop', 'mobile' ), + ), + 'jquery.chosen' => array( + 'scripts' => 'resources/jquery.chosen/chosen.jquery.js', + 'styles' => 'resources/jquery.chosen/chosen.css', ), 'jquery.client' => array( 'scripts' => 'resources/jquery/jquery.client.js', @@ -210,6 +229,7 @@ return array( ), 'jquery.getAttrs' => array( 'scripts' => 'resources/jquery/jquery.getAttrs.js', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.hidpi' => array( 'scripts' => 'resources/jquery/jquery.hidpi.js', @@ -233,12 +253,14 @@ return array( 'scripts' => 'resources/jquery/jquery.makeCollapsible.js', 'styles' => 'resources/jquery/jquery.makeCollapsible.css', 'messages' => array( 'collapsible-expand', 'collapsible-collapse' ), + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.mockjax' => array( 'scripts' => 'resources/jquery/jquery.mockjax.js', ), 'jquery.mw-jump' => array( 'scripts' => 'resources/jquery/jquery.mw-jump.js', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.mwExtension' => array( 'scripts' => 'resources/jquery/jquery.mwExtension.js', @@ -246,15 +268,18 @@ return array( ), 'jquery.placeholder' => array( 'scripts' => 'resources/jquery/jquery.placeholder.js', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.qunit' => array( 'scripts' => 'resources/jquery/jquery.qunit.js', 'styles' => 'resources/jquery/jquery.qunit.css', 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.qunit.completenessTest' => array( 'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js', 'dependencies' => 'jquery.qunit', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.spinner' => array( 'scripts' => 'resources/jquery/jquery.spinner.js', @@ -276,7 +301,10 @@ return array( 'scripts' => 'resources/jquery/jquery.tablesorter.js', 'styles' => 'resources/jquery/jquery.tablesorter.css', 'messages' => array( 'sort-descending', 'sort-ascending' ), - 'dependencies' => 'jquery.mwExtension', + 'dependencies' => array( + 'jquery.mwExtension', + 'mediawiki.language.months', + ), ), 'jquery.textSelection' => array( 'scripts' => 'resources/jquery/jquery.textSelection.js', @@ -605,6 +633,12 @@ return array( 'mediawiki.Title', ), ), + 'mediawiki.api.login' => array( + 'scripts' => 'resources/mediawiki.api/mediawiki.api.login.js', + 'dependencies' => array( + 'mediawiki.api', + ), + ), 'mediawiki.api.parse' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js', 'dependencies' => 'mediawiki.api', @@ -616,6 +650,9 @@ return array( 'user.tokens', ), ), + 'mediawiki.icon' => array( + 'styles' => 'resources/mediawiki/mediawiki.icon.css', + ), 'mediawiki.debug' => array( 'scripts' => 'resources/mediawiki/mediawiki.debug.js', 'styles' => 'resources/mediawiki/mediawiki.debug.css', @@ -629,6 +666,14 @@ return array( // must be loaded on the bottom 'position' => 'bottom', ), + 'mediawiki.inspect' => array( + 'scripts' => 'resources/mediawiki/mediawiki.inspect.js', + 'dependencies' => array( + 'jquery.byteLength', + 'jquery.json', + ), + 'targets' => array( 'desktop', 'mobile' ), + ), 'mediawiki.feedback' => array( 'scripts' => 'resources/mediawiki/mediawiki.feedback.js', 'styles' => 'resources/mediawiki/mediawiki.feedback.css', @@ -663,6 +708,7 @@ return array( ), 'mediawiki.htmlform' => array( 'scripts' => 'resources/mediawiki/mediawiki.htmlform.js', + 'messages' => array( 'htmlform-chosen-placeholder' ), ), 'mediawiki.notification' => array( 'styles' => 'resources/mediawiki/mediawiki.notification.css', @@ -687,11 +733,15 @@ return array( 'jquery.client', 'jquery.placeholder', 'jquery.suggestions', + 'mediawiki.api', ), ), 'mediawiki.Title' => array( 'scripts' => 'resources/mediawiki/mediawiki.Title.js', - 'dependencies' => 'mediawiki.util', + 'dependencies' => array( + 'jquery.byteLength', + 'mediawiki.util', + ), ), 'mediawiki.Uri' => array( 'scripts' => 'resources/mediawiki/mediawiki.Uri.js', @@ -723,16 +773,30 @@ return array( 'mediawiki.action.edit' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js', 'dependencies' => array( + 'mediawiki.action.edit.styles', 'jquery.textSelection', 'jquery.byteLimit', ), 'position' => 'top', ), + 'mediawiki.action.edit.styles' => array( + 'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css', + 'position' => 'top', + ), + 'mediawiki.action.edit.collapsibleFooter' => array( + 'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js', + 'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css', + 'dependencies' => array( + 'jquery.makeCollapsible', + 'mediawiki.icon', + ), + ), 'mediawiki.action.edit.preview' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js', 'dependencies' => array( 'jquery.form', 'jquery.spinner', + 'mediawiki.action.history.diff', ), ), 'mediawiki.action.history' => array( @@ -759,11 +823,24 @@ return array( ), 'mediawiki.action.view.postEdit' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.js', - 'dependencies' => 'jquery.cookie' + 'styles' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.css', + 'dependencies' => array( + 'jquery.cookie', + 'mediawiki.jqueryMsg' + ), + 'messages' => array( + 'postedit-confirmation', + ), ), 'mediawiki.action.view.rightClickEdit' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js', ), + 'mediawiki.action.edit.editWarning' => array( + 'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.editWarning.js', + 'messages' => array( + 'editwarning-warning', + ), + ), // Alias for backwards compatibility 'mediawiki.action.watch.ajax' => array( 'dependencies' => 'mediawiki.page.watch.ajax' @@ -825,6 +902,16 @@ return array( 'targets' => array( 'desktop', 'mobile' ), ), + 'mediawiki.language.months' => array( + 'scripts' => 'resources/mediawiki.language/mediawiki.language.months.js', + 'dependencies' => 'mediawiki.language', + 'messages' => array_merge( + Language::$mMonthMsgs, + Language::$mMonthGenMsgs, + Language::$mMonthAbbrevMsgs + ) + ), + /* MediaWiki Libs */ 'mediawiki.libs.jpegmeta' => array( @@ -833,6 +920,9 @@ return array( /* MediaWiki Page */ + 'mediawiki.page.gallery' => array( + 'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js', + ), 'mediawiki.page.ready' => array( 'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js', 'dependencies' => array( @@ -842,6 +932,7 @@ return array( 'jquery.mw-jump', 'mediawiki.util', ), + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.page.startup' => array( 'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js', @@ -850,6 +941,7 @@ return array( 'mediawiki.util', ), 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.page.patrol.ajax' => array( 'scripts' => 'resources/mediawiki.page/mediawiki.page.patrol.ajax.js', @@ -887,6 +979,10 @@ return array( 'watcherrortext', ), ), + 'mediawiki.page.image.pagination' => array( + 'scripts' => 'resources/mediawiki.page/mediawiki.page.image.pagination.js', + 'dependencies' => array( 'jquery.spinner' ) + ), /* MediaWiki Special pages */ @@ -913,15 +1009,21 @@ return array( ), 'mediawiki.special.changeslist' => array( 'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css', - 'dependencies' => array( 'jquery.makeCollapsible' ), + ), + 'mediawiki.special.changeslist.enhanced' => array( + 'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css', ), 'mediawiki.special.movePage' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js', 'dependencies' => 'jquery.byteLimit', ), + 'mediawiki.special.pagesWithProp' => array( + 'styles' => 'resources/mediawiki.special/mediawiki.special.pagesWithProp.css', + ), 'mediawiki.special.preferences' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js', - 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css', + 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css', + 'position' => 'top', ), 'mediawiki.special.recentchanges' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js', @@ -941,7 +1043,7 @@ return array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js', ), 'mediawiki.special.upload' => array( - // @TODO: merge in remainder of mediawiki.legacy.upload + // @todo merge in remainder of mediawiki.legacy.upload 'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js', 'messages' => array( 'widthheight', @@ -951,10 +1053,33 @@ return array( 'size-gigabytes', 'largefileserver', ), - 'dependencies' => array( 'mediawiki.libs.jpegmeta', 'mediawiki.util' ), + 'dependencies' => array( + 'mediawiki.libs.jpegmeta', + 'mediawiki.util', + ), + ), + 'mediawiki.special.userlogin' => array( + 'styles' => array( + 'resources/mediawiki.special/mediawiki.special.vforms.css', + 'resources/mediawiki.special/mediawiki.special.userLogin.css', + ), + 'position' => 'top', + ), + 'mediawiki.special.createaccount' => array( + 'styles' => array( + 'resources/mediawiki.special/mediawiki.special.vforms.css', + 'resources/mediawiki.special/mediawiki.special.createAccount.css', + ), ), - 'mediawiki.special.userlogin.signup' => array( - 'scripts' => 'resources/mediawiki.special/mediawiki.special.userLogin.signup.js', + 'mediawiki.special.createaccount.js' => array( + 'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.js', + 'messages' => array( + 'createacct-captcha', + 'createacct-emailrequired', + 'createacct-imgcaptcha-ph' + ), + 'dependencies' => 'mediawiki.jqueryMsg', + 'position' => 'top', ), 'mediawiki.special.javaScriptTest' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js', @@ -964,6 +1089,7 @@ return array( ) ), 'dependencies' => array( 'jquery.qunit' ), 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), ), /* MediaWiki Tests */ @@ -978,6 +1104,7 @@ return array( 'mediawiki.page.ready', ), 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), ), /* MediaWiki Legacy */ @@ -998,14 +1125,9 @@ return array( 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), 'mediawiki.legacy.config' => array( + // Used in the web installer. Test it after modifying this definition! 'scripts' => 'common/config.js', - 'styles' => array( 'common/config.css', 'common/config-cc.css' ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - 'dependencies' => 'mediawiki.legacy.wikibits', - ), - 'mediawiki.legacy.IEFixes' => array( - 'scripts' => 'common/IEFixes.js', + 'styles' => array( 'common/config.css' ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], 'dependencies' => 'mediawiki.legacy.wikibits', @@ -1015,12 +1137,12 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], 'dependencies' => array( - 'mediawiki.legacy.wikibits', 'jquery.byteLimit', ), 'position' => 'top', ), 'mediawiki.legacy.shared' => array( + // Used in the web installer. Test it after modifying this definition! 'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], @@ -1035,7 +1157,9 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], 'dependencies' => array( - 'mediawiki.legacy.wikibits', + 'jquery.spinner', + 'mediawiki.api', + 'mediawiki.Title', 'mediawiki.util', ), ), @@ -1048,9 +1172,11 @@ return array( ), 'position' => 'top', ), - 'mediawiki.legacy.wikiprintable' => array( - 'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], + 'mediawiki.ui' => array( + 'skinStyles' => array( + 'default' => 'resources/mediawiki.ui/mediawiki.ui.default.css', + 'vector' => 'resources/mediawiki.ui/mediawiki.ui.vector.css', + ), + 'position' => 'top', ), ); -- cgit v1.2.2