X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=6057b394171c1097376d5c212eb99556c217e1f8;hb=1080837570961d40a3483caa7be0b7587873815e;hp=668dc14ee35c8bbb56348e3e924c7474135b93ab;hpb=9f3dd6ceb2193056eea1b334bfca67d546594df1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 668dc14ee3..6057b39417 100644
--- 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 */
 
@@ -907,6 +919,7 @@ return array(
 			'jquery.accessKeyLabel',
 			'jquery.mwExtension',
 			'mediawiki.notify',
+			'mediawiki.toc', // bug 64765
 		),
 		'position' => 'top', // For $wgPreloadJavaScriptMwUtil
 		'targets' => array( 'desktop', 'mobile' ),
@@ -975,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(
@@ -1069,6 +1084,8 @@ return array(
 		)
 	),
 
+	'mediawiki.language.names' => array( 'class' => 'ResourceLoaderLanguageNamesModule' ),
+
 	/* MediaWiki Libs */
 
 	'mediawiki.libs.jpegmeta' => array(