Merge "mwjsduck-gen: Abort early and report exit code"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 3433a23..6057b39 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -50,6 +50,8 @@ return array(
        // Scripts for the dynamic language specific data, like grammar forms.
        'mediawiki.language.data' => array( 'class' => 'ResourceLoaderLanguageDataModule' ),
 
+       /* MediaWiki base skinning modules */
+
        /**
         * Common skin styles, grouped into three graded levels.
         *
@@ -74,12 +76,38 @@ return array(
         *     common to MonoBook clones. And since practically every skin that currently exists within
         *     core is a MonoBook clone, all our core skins currently use this level.
         *
-        * These modules are typically loaded by addModuleStyles which has absolutely no concept of
-        * dependency management. As a result, the skins.common.* modules contain duplicate stylesheet
-        * references instead of setting 'dependencies' to the lower level the module is based on. For
-        * this reason avoid including multiple skins.common.* modules into your skin as this will
-        * result in duplicate css.
+        * These modules are typically loaded by addModuleStyles(), which has absolutely no concept of
+        * dependency management. As a result they contain duplicate stylesheet references instead of
+        * setting 'dependencies' to the lower level the module is based on. For this reason avoid
+        * including more than one of them into your skin as this will result in duplicate CSS.
         */
+       'mediawiki.skinning.elements' => array(
+               'styles' => array(
+                       'common/commonElements.css' => array( 'media' => 'screen' ),
+               ),
+               'remoteBasePath' => $GLOBALS['wgStylePath'],
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+       ),
+       'mediawiki.skinning.content' => array(
+               'styles' => array(
+                       'common/commonElements.css' => array( 'media' => 'screen' ),
+                       'common/commonContent.css' => array( 'media' => 'screen' ),
+               ),
+               'remoteBasePath' => $GLOBALS['wgStylePath'],
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
+       ),
+       'mediawiki.skinning.interface' => 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'],
+       ),
+
+       // Temporarily kept for backwards-compatibility with generated HTML
        'skins.common.elements' => array(
                'styles' => array(
                        'common/commonElements.css' => array( 'media' => 'screen' ),
@@ -96,7 +124,6 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.common.interface' => 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' ),
@@ -106,6 +133,7 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
 
+
        /**
         * Skins
         * Be careful not to add 'scripts' to these modules,
@@ -158,22 +186,6 @@ return array(
                '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 */
 
@@ -190,6 +202,7 @@ return array(
                'dependencies' => array(
                        'jquery.client',
                ),
+               'targets' => array( 'mobile', 'desktop' ),
        ),
        'jquery.appear' => array(
                'scripts' => 'resources/lib/jquery/jquery.appear.js',
@@ -906,6 +919,7 @@ return array(
                        'jquery.accessKeyLabel',
                        'jquery.mwExtension',
                        'mediawiki.notify',
+                       'mediawiki.toc', // bug 64765
                ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
                'targets' => array( 'desktop', 'mobile' ),
@@ -974,7 +988,9 @@ return array(
                        'mediawiki.jqueryMsg'
                ),
                'messages' => array(
-                       'postedit-confirmation',
+                       'postedit-confirmation-created',
+                       'postedit-confirmation-restored',
+                       'postedit-confirmation-saved',
                ),
        ),
        'mediawiki.action.view.redirectToFragment' => array(
@@ -1068,6 +1084,8 @@ return array(
                )
        ),
 
+       'mediawiki.language.names' => array( 'class' => 'ResourceLoaderLanguageNamesModule' ),
+
        /* MediaWiki Libs */
 
        'mediawiki.libs.jpegmeta' => array(