Merge "Move VectorBeta modules to VectorBeta extension"

diff --combined includes/DefaultSettings.php
index f0c0ee5,6d6e528..690bec2
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3344,6 -3344,7 +3344,7 @@@ $wgResourceLoaderLESSFunctions = array
   */
  $wgResourceLoaderLESSImportPaths = array(
        "$IP/resources/mediawiki.less/",
+       "$IP/skins/vector/",
  );
  
  /**
@@@ -5933,16 -5934,6 +5934,16 @@@ $wgExtensionFunctions = array()
   * Variables defined in extensions will override conflicting variables defined
   * in the core.
   *
 + * Since MediaWiki 1.23, use of this variable to define messages is discouraged; instead, store
 + * messages in JSON format and use $wgMessagesDirs. For setting other variables than
 + * $messages, $wgExtensionMessagesFiles should still be used.
 + *
 + * If there is an entry in $wgMessagesDirs with the same key as one in
 + * $wgExtensionMessagesFiles, then any $messages variables set in the $wgExtensionMessagesFiles file
 + * will be ignored. This means an extension that only provides messages can be backwards compatible
 + * by using both $wgExtensionMessagesFiles and $wgMessagesDirs, and only one of the two
 + * will be used depending on what the version of MediaWiki supports.
 + *
   * @par Example:
   * @code
   *    $wgExtensionMessagesFiles['ConfirmEdit'] = __DIR__.'/ConfirmEdit.i18n.php';
@@@ -5950,32 -5941,6 +5951,32 @@@
   */
  $wgExtensionMessagesFiles = array();
  
 +/**
 + * Extension messages directories.
 + *
 + * Associative array mapping extension name to the path of the directory where message files can
 + * be found. The message files are expected to be JSON files named for their language code, e.g.
 + * en.json, de.json, etc. Extensions with messages in multiple places may specify an array of
 + * message directories.
 + *
 + * @par Simple example:
 + * @code
 + *    $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
 + * @endcode
 + *
 + * @par Complex example:
 + * @code
 + *    $wgMessagesDirs['VisualEditor'] = array(
 + *        __DIR__ . '/i18n',
 + *        __DIR__ . '/modules/ve-core/i18n',
 + *        __DIR__ . '/modules/qunit/localisation',
 + *        __DIR__ . '/modules/oojs-ui/messages',
 + *    )
 + * @endcode
 + * @since 1.23
 + */
 +$wgMessagesDirs = array();
 +
  /**
   * Array of files with list(s) of extension entry points to be used in
   * maintenance/mergeMessageFileList.php

diff --combined resources/Resources.php
index bf7fe8d,c8f58e3..6fd1665
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -76,6 -76,17 +76,17 @@@ return array
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
+       'skins.common' => 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' ),
+               ),
+               'remoteBasePath' => $GLOBALS['wgStylePath'],
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+       ),
+       // FIXME: Remove in favour of skins.monobook.styles when cache expires
        'skins.monobook' => array(
                'styles' => array(
                        'common/commonElements.css' => array( 'media' => 'screen' ),
@@@ -86,8 -97,8 +97,8 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
+       // FIXME: Remove in favour of skins.vector.styles when cache expires
        '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' ),
@@@ -97,13 -108,17 +108,17 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
-       'skins.vector.beta' => array(
-               // Keep in sync with skins.vector
+       'skins.vector.styles' => 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-beta.less',
+                       'vector/styles.less',
+               ),
+               'remoteBasePath' => $GLOBALS['wgStylePath'],
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+       ),
+       'skins.monobook.styles' => array(
+               'styles' => array(
+                       'monobook/main.css' => array( 'media' => 'screen' ),
                ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
@@@ -1013,13 -1028,6 +1028,13 @@@
        'mediawiki.special.changeslist' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
        ),
 +      'mediawiki.special.changeslist.js' => array(
 +              'scripts' => 'resources/mediawiki.special/mediawiki.special.changeslist.js',
 +              'dependencies' => array(
 +                      'jquery.makeCollapsible',
 +                      'jquery.cookie',
 +              ),
 +      ),
        'mediawiki.special.changeslist.enhanced' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
        ),
@@@ -1194,16 -1202,6 +1209,16 @@@
                        'vector' => 'resources/mediawiki.ui/vector.less',
                ),
                'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
 +      // Lightweight module for button styles
 +      'mediawiki.ui.button' => array(
 +              'skinStyles' => array(
 +                      'default' => 'resources/mediawiki.ui/components/default/buttons.less',
 +                      'vector' => 'resources/mediawiki.ui/components/vector/buttons.less',
 +              ),
 +              'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
        ),
  
        /* OOJS */
@@@ -1215,4 -1213,5 +1230,4 @@@
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
 -
  );