Merge mediawiki.legacy.upload into mediawiki.special.upload

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 99e1e4f..36959ef 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -83,33 +83,27 @@ return array(
         */
        'mediawiki.skinning.elements' => array(
                'styles' => array(
-                       'commonElements.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
                ),
-               'remoteSkinPath' => 'common',
-               'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common',
        ),
        'mediawiki.skinning.content' => array(
                'styles' => array(
-                       'commonElements.css' => array( 'media' => 'screen' ),
-                       'commonContent.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ),
                ),
-               'remoteSkinPath' => 'common',
-               'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common',
        ),
        'mediawiki.skinning.interface' => array(
                // Used in the web installer. Test it after modifying this definition!
                'styles' => array(
-                       'commonElements.css' => array( 'media' => 'screen' ),
-                       'commonContent.css' => array( 'media' => 'screen' ),
-                       'commonInterface.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki.skinning/interface.css' => array( 'media' => 'screen' ),
                ),
-               'remoteSkinPath' => 'common',
-               'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common',
        ),
 
        'mediawiki.skinning.content.parsoid' => array(
                // Style Parsoid HTML+RDFa output consistent with wikitext from PHP parser
-               // with the commonInterface.css styles; skinStyles should be used if your
+               // with the interface.css styles; skinStyles should be used if your
                // skin over-rides common content styling.
                'skinStyles' => array(
                        'default' => 'resources/src/mediawiki.skinning/content.parsoid.less',
@@ -117,6 +111,12 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
 
+       'mediawiki.skinning.content.externallinks' => array(
+               'styles' => array(
+                       'resources/src/mediawiki.skinning/content.externallinks.css' => array( 'media' => 'screen' ),
+               ),
+       ),
+
        /* jQuery */
 
        'jquery' => array(
@@ -914,6 +914,10 @@ return array(
                'scripts' => 'resources/src/mediawiki/mediawiki.notify.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.pager.tablePager' => array(
+               'styles' => 'resources/src/mediawiki/mediawiki.pager.tablePager.less',
+               'position' => 'top',
+       ),
        'mediawiki.searchSuggest' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js',
                'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css',
@@ -1026,6 +1030,7 @@ return array(
                ),
        ),
        'mediawiki.action.view.metadata' => array(
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.metadata.css',
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.metadata.js',
                'messages' => array(
                        'metadata-expand',
@@ -1100,6 +1105,11 @@ return array(
                                'mediawiki.cldr',
                        ),
                'targets' => array( 'desktop', 'mobile' ),
+               'messages' => array(
+                       'and',
+                       'comma-separator',
+                       'word-separator'
+               ),
        ),
 
        'mediawiki.cldr' => array(
@@ -1299,7 +1309,6 @@ return array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
-               // @todo merge in remainder of mediawiki.legacy.upload
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
@@ -1310,7 +1319,10 @@ return array(
                        'largefileserver',
                ),
                'dependencies' => array(
+                       'jquery.spinner',
+                       'mediawiki.api',
                        'mediawiki.libs.jpegmeta',
+                       'mediawiki.Title',
                        'mediawiki.util',
                ),
        ),
@@ -1401,24 +1413,18 @@ return array(
        /* MediaWiki Legacy */
 
        'mediawiki.legacy.ajax' => array(
-               'scripts' => 'common/ajax.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+               'scripts' => 'resources/src/mediawiki.legacy/ajax.js',
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.legacy.wikibits',
                ),
-               'position' => 'top', // Temporary hack for legacy support
+               'position' => 'top',
        ),
        'mediawiki.legacy.commonPrint' => array(
-               'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+               'styles' => array( 'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' ) ),
        ),
        'mediawiki.legacy.protect' => array(
-               'scripts' => 'common/protect.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+               'scripts' => 'resources/src/mediawiki.legacy/protect.js',
                'dependencies' => array(
                        'jquery.byteLimit',
                ),
@@ -1426,30 +1432,13 @@ return array(
        ),
        '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'],
+               'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) ),
        ),
        'mediawiki.legacy.oldshared' => array(
-               'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
-       ),
-       'mediawiki.legacy.upload' => array(
-               'scripts' => 'common/upload.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => array(
-                       'jquery.spinner',
-                       'mediawiki.api',
-                       'mediawiki.Title',
-                       'mediawiki.util',
-               ),
+               'styles' => array( 'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' ) ),
        ),
        'mediawiki.legacy.wikibits' => array(
-               'scripts' => 'common/wikibits.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+               'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
                'dependencies' => array(
                        'mediawiki.util',
                ),
@@ -1500,6 +1489,7 @@ return array(
        'es5-shim' => array(
                'scripts' => array(
                        'resources/lib/es5-shim/es5-shim.js',
+                       'resources/src/polyfill-object-create.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
                'skipFunction' => 'resources/src/es5-skip.js',
@@ -1530,7 +1520,7 @@ return array(
                'skinStyles' => array(
                        'default' => 'resources/lib/oojs-ui/oojs-ui-apex.css',
                        // FIXME As of July 2014, this is to be gone "in a couple of months".
-                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-agora.css',
+                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.css',
                ),
                'messages' => array(
                        'ooui-outline-control-move-down',