X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=e5d80cad711eb370961ee174d1213200c5ff9a42;hb=17dc3d4575aadf5aff2e2cdd4598cd1c2a0a293d;hp=deaa8022081cfcaf29d13803e7aa48a902569f74;hpb=1ce7d64af16e7ba061509d16d0d7feffa3feb340;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index deaa802208..e5d80cad71 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -113,7 +113,6 @@ return array(
 		// skin over-rides common content styling.
 		'skinStyles' => array(
 			'default' => 'resources/src/mediawiki.skinning/content.parsoid.less',
-			'minerva' => array(),
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),
@@ -192,6 +191,19 @@ return array(
 	'jquery.colorUtil' => array(
 		'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
 	),
+	'jquery.confirmable' => array(
+		'scripts' => array(
+			'resources/src/jquery/jquery.confirmable.js',
+			'resources/src/jquery/jquery.confirmable.mediawiki.js',
+		),
+		'messages' => array(
+			'confirmable-confirm',
+			'confirmable-yes',
+			'confirmable-no',
+		),
+		'styles' => 'resources/src/jquery/jquery.confirmable.css',
+		'dependencies' => 'mediawiki.jqueryMsg',
+	),
 	// Use mediawiki.cookie in new code, rather than jquery.cookie.
 	'jquery.cookie' => array(
 		'scripts' => 'resources/lib/jquery/jquery.cookie.js',
@@ -329,10 +341,6 @@ return array(
 				'resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css',
 				'resources/lib/jquery.ui/themes/smoothness/jquery.ui.theme.css',
 			),
-			'vector' => array(
-				'resources/src/jquery.ui-themes/vector/jquery.ui.core.css',
-				'resources/src/jquery.ui-themes/vector/jquery.ui.theme.css',
-			),
 		),
 		'group' => 'jquery.ui',
 	),
@@ -344,7 +352,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -358,7 +365,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.autocomplete.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -370,7 +376,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.button.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.button.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -379,7 +384,6 @@ return array(
 		'dependencies' => 'jquery.ui.core',
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.datepicker.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css',
 		),
 		'languageScripts' => array(
 			'af' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-af.js',
@@ -465,7 +469,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.dialog.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -497,7 +500,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.menu.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.menu.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -518,7 +520,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -531,7 +532,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.resizable.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -544,7 +544,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -557,7 +556,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.slider.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -579,7 +577,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.spinner.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.spinner.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -591,7 +588,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -604,7 +600,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tooltip.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tooltip.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -816,6 +811,9 @@ return array(
 			'user.tokens',
 		),
 	),
+	'mediawiki.content.json' => array(
+		'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
+	),
 	'mediawiki.debug' => array(
 		'scripts' => array(
 			'resources/src/mediawiki/mediawiki.debug.js',
@@ -880,6 +878,9 @@ return array(
 	),
 	'mediawiki.htmlform' => array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
+		'dependencies' => array(
+			'jquery.mwExtension',
+		),
 		'messages' => array( 'htmlform-chosen-placeholder' ),
 	),
 	'mediawiki.icon' => array(
@@ -1052,6 +1053,7 @@ return array(
 	'mediawiki.action.edit.editWarning' => array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
 		'dependencies' => array(
+			'jquery.textSelection',
 			'mediawiki.jqueryMsg'
 		),
 		'messages' => array(
@@ -1196,7 +1198,11 @@ return array(
 	),
 	'mediawiki.page.image.pagination' => array(
 		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.image.pagination.js',
-		'dependencies' => array( 'jquery.spinner' )
+		'dependencies' => array(
+			'mediawiki.Uri',
+			'mediawiki.util',
+			'jquery.spinner',
+		),
 	),
 
 	/* MediaWiki Special pages */
@@ -1204,9 +1210,6 @@ return array(
 	'mediawiki.special' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.js',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
-		'skinStyles' => array(
-			'vector' => 'skins/Vector/special.less', // FIXME this should use $wgStyleDirectory
-		),
 	),
 	'mediawiki.special.block' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
@@ -1256,9 +1259,6 @@ return array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.css',
 		'position' => 'top',
-		'skinStyles' => array(
-			'vector' => 'skins/Vector/special.preferences.less', // FIXME this should use $wgStyleDirectory
-		),
 		'messages' => array(
 			'prefs-tabs-navigation-hint',
 		),
@@ -1448,6 +1448,19 @@ return array(
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+	'mediawiki.ui.checkbox' => array(
+		'styles' => array(
+			'resources/src/mediawiki.ui/components/checkbox.less',
+		),
+	),
+	// Lightweight module for anchor styles
+	'mediawiki.ui.anchor' => array(
+		'styles' => 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(
@@ -1456,6 +1469,13 @@ return array(
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+	'mediawiki.ui.input' => array(
+		'styles' => array(
+			'resources/src/mediawiki.ui/components/inputs.less',
+		),
+		'position' => 'top',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 
 	/* es5-shim */
 	'es5-shim' => array(
@@ -1490,6 +1510,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',
 		),
 		'messages' => array(