X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=a82260c09f4f0df08aff7503b6959a3b051a34dc;hb=d607e6a70bb0250aad5a899aa14b663eb3404766;hp=49f62b48d5186f9d6d62807beef8ffda9723329c;hpb=4dd56b2268520b03bf90e359258cd63778bab9f8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 49f62b48d5..a82260c09f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -818,6 +818,11 @@ return array(
 	'mediawiki.content.json' => array(
 		'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
 	),
+	'mediawiki.confirmCloseWindow' => array(
+		'scripts' => array(
+			'resources/src/mediawiki/mediawiki.confirmCloseWindow.js',
+		),
+	),
 	'mediawiki.debug' => array(
 		'scripts' => array(
 			'resources/src/mediawiki/mediawiki.debug.js',
@@ -984,8 +989,10 @@ return array(
 
 	'mediawiki.action.edit' => array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
+		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
 		'dependencies' => array(
 			'mediawiki.action.edit.styles',
+			'mediawiki.action.edit.toolbar',
 			'jquery.textSelection',
 			'jquery.byteLimit',
 		),
@@ -995,6 +1002,10 @@ return array(
 		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
 		'position' => 'top',
 	),
+	'mediawiki.action.edit.toolbar' => array(
+		'class' => 'ResourceLoaderEditToolbarModule',
+		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.toolbar/mediawiki.action.edit.toolbar.less',
+	),
 	'mediawiki.action.edit.collapsibleFooter' => array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
 		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
@@ -1073,7 +1084,8 @@ return array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
 		'dependencies' => array(
 			'jquery.textSelection',
-			'mediawiki.jqueryMsg'
+			'mediawiki.jqueryMsg',
+			'mediawiki.confirmCloseWindow',
 		),
 		'messages' => array(
 			'editwarning-warning',
@@ -1169,11 +1181,11 @@ return array(
 	'mediawiki.page.ready' => array(
 		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
 		'dependencies' => array(
+			'jquery.accessKeyLabel',
 			'jquery.checkboxShiftClick',
 			'jquery.makeCollapsible',
 			'jquery.placeholder',
 			'jquery.mw-jump',
-			'mediawiki.util',
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),
@@ -1294,6 +1306,10 @@ return array(
 		'dependencies' => array(
 			'mediawiki.language',
 		),
+		'messages' => array(
+			'prefswarning-warning',
+			'saveprefs',
+		),
 	),
 	'mediawiki.special.recentchanges' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
@@ -1313,7 +1329,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',
@@ -1324,7 +1339,10 @@ return array(
 			'largefileserver',
 		),
 		'dependencies' => array(
+			'jquery.spinner',
+			'mediawiki.api',
 			'mediawiki.libs.jpegmeta',
+			'mediawiki.Title',
 			'mediawiki.util',
 		),
 	),
@@ -1423,29 +1441,26 @@ return array(
 		'position' => 'top',
 	),
 	'mediawiki.legacy.commonPrint' => array(
-		'styles' => array( 'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' ) ),
+		'styles' => array(
+			'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
+		),
 	),
 	'mediawiki.legacy.protect' => array(
 		'scripts' => 'resources/src/mediawiki.legacy/protect.js',
 		'dependencies' => array(
 			'jquery.byteLimit',
 		),
-		'position' => 'top',
+		'messages' => array( 'protect-unchain-permissions' )
 	),
 	'mediawiki.legacy.shared' => array(
 		// Used in the web installer. Test it after modifying this definition!
-		'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) ),
+		'styles' => array(
+			'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
+		),
 	),
 	'mediawiki.legacy.oldshared' => array(
-		'styles' => array( 'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' ) ),
-	),
-	'mediawiki.legacy.upload' => array(
-		'scripts' => 'resources/src/mediawiki.legacy/upload.js',
-		'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(
@@ -1459,38 +1474,48 @@ return array(
 	/* MediaWiki UI */
 
 	'mediawiki.ui' => array(
-		'styles' => array(
-			'resources/src/mediawiki.ui/default.less',
+		'skinStyles' => array(
+			'default' => array(
+				'resources/src/mediawiki.ui/default.less',
+			),
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.ui.checkbox' => array(
-		'styles' => array(
-			'resources/src/mediawiki.ui/components/checkbox.less',
+		'skinStyles' => array(
+			'default' => array(
+				'resources/src/mediawiki.ui/components/checkbox.less',
+			),
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	// Lightweight module for anchor styles
 	'mediawiki.ui.anchor' => array(
-		'styles' => array(
-			'resources/src/mediawiki.ui/components/anchors.less',
+		'skinStyles' => array(
+			'default' => array(
+				'resources/src/mediawiki.ui/components/anchors.less',
+			),
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	// Lightweight module for button styles
 	'mediawiki.ui.button' => array(
-		'styles' => array(
-			'resources/src/mediawiki.ui/components/buttons.less',
+		'skinStyles' => array(
+			'default' => array(
+				'resources/src/mediawiki.ui/components/buttons.less',
+			),
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.ui.input' => array(
-		'styles' => array(
-			'resources/src/mediawiki.ui/components/inputs.less',
+		'skinStyles' => array(
+			'default' => array(
+				'resources/src/mediawiki.ui/components/inputs.less',
+			),
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),