X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=d6e13ed3f447894c827f4217ea816ff858ccd860;hb=353bf866d72e6f1341c279b0f438fa99535c88f4;hp=4e593128d03bdaffb68b51c9d4a86a9994643e46;hpb=73f52a6c0c913c927cc32bcbe3558c49f57f3350;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 4e593128d0..d6e13ed3f4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -860,7 +860,7 @@ return array(
 		'position' => 'top',
 	),
 	'mediawiki.api' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js',
+		'scripts' => 'resources/src/mediawiki/api.js',
 		'dependencies' => array(
 			'mediawiki.util',
 			'user.tokens',
@@ -868,14 +868,14 @@ return array(
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.api.category' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.category.js',
+		'scripts' => 'resources/src/mediawiki/api/category.js',
 		'dependencies' => array(
 			'mediawiki.api',
 			'mediawiki.Title',
 		),
 	),
 	'mediawiki.api.edit' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.edit.js',
+		'scripts' => 'resources/src/mediawiki/api/edit.js',
 		'dependencies' => array(
 			'mediawiki.api',
 			'mediawiki.Title',
@@ -883,21 +883,21 @@ return array(
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.api.login' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
+		'scripts' => 'resources/src/mediawiki/api/login.js',
 		'dependencies' => 'mediawiki.api',
 	),
 	'mediawiki.api.options' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.options.js',
+		'scripts' => 'resources/src/mediawiki/api/options.js',
 		'dependencies' => 'mediawiki.api',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.api.parse' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
+		'scripts' => 'resources/src/mediawiki/api/parse.js',
 		'dependencies' => 'mediawiki.api',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.api.upload' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.upload.js',
+		'scripts' => 'resources/src/mediawiki/api/upload.js',
 		'dependencies' => array(
 			'dom-level2-shim',
 			'mediawiki.api',
@@ -906,7 +906,7 @@ return array(
 		),
 	),
 	'mediawiki.api.watch' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.watch.js',
+		'scripts' => 'resources/src/mediawiki/api/watch.js',
 		'dependencies' => array(
 			'mediawiki.api',
 		),
@@ -993,7 +993,7 @@ return array(
 		'dependencies' => 'mediawiki.ForeignApi.core',
 	),
 	'mediawiki.ForeignApi.core' => array(
-		'scripts' => 'resources/src/mediawiki.api/mediawiki.ForeignApi.js',
+		'scripts' => 'resources/src/mediawiki/ForeignApi.js',
 		'dependencies' => array(
 			'mediawiki.api',
 			'oojs',
@@ -1151,25 +1151,37 @@ return array(
 		),
 	),
 	'mediawiki.Upload.Dialog' => array(
-		'scripts' => 'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
+		'scripts' => array(
+			'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
+		),
 		'dependencies' => array(
-			'oojs-ui',
-			'mediawiki.Upload',
+			'mediawiki.Upload.BookletLayout',
 		),
 		'messages' => array(
 			'upload-dialog-title',
-			'upload-dialog-error',
-			'upload-dialog-warning',
 			'upload-dialog-button-cancel',
 			'upload-dialog-button-done',
 			'upload-dialog-button-save',
 			'upload-dialog-button-upload',
-			'upload-dialog-label-select-file',
-			'upload-dialog-label-infoform-title',
-			'upload-dialog-label-infoform-name',
-			'upload-dialog-label-infoform-description',
-			'upload-dialog-label-usage-title',
-			'upload-dialog-label-usage-filename',
+		),
+	),
+	'mediawiki.Upload.BookletLayout' => array(
+		'scripts' => array(
+			'resources/src/mediawiki/mediawiki.Upload.BookletLayout.js',
+		),
+		'dependencies' => array(
+			'oojs-ui',
+			'mediawiki.Upload',
+		),
+		'messages' => array(
+			'upload-process-error',
+			'upload-process-warning',
+			'upload-form-label-select-file',
+			'upload-form-label-infoform-title',
+			'upload-form-label-infoform-name',
+			'upload-form-label-infoform-description',
+			'upload-form-label-usage-title',
+			'upload-form-label-usage-filename',
 		),
 	),
 	'mediawiki.toc' => array(
@@ -1369,7 +1381,8 @@ return array(
 	),
 	'mediawiki.action.view.filepage' => array(
 		'styles' => array(
-			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' =>
+				array( 'media' => 'print' ),
 			'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
 		),
 		'position' => 'top',
@@ -1466,7 +1479,7 @@ return array(
 	/* MediaWiki Page */
 
 	'mediawiki.page.gallery' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
+		'scripts' => 'resources/src/mediawiki/page/gallery.js',
 		'dependencies' => array(
 			'mediawiki.page.gallery.styles',
 			'jquery.throttle-debounce',
@@ -1474,14 +1487,14 @@ return array(
 	),
 	'mediawiki.page.gallery.styles' => array(
 		'styles' => array(
-			'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
-			'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+			'resources/src/mediawiki/page/gallery-print.css' => array( 'media' => 'print' ),
+			'resources/src/mediawiki/page/gallery.css',
 		),
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.page.ready' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
+		'scripts' => 'resources/src/mediawiki/page/ready.js',
 		'dependencies' => array(
 			'jquery.accessKeyLabel',
 			'jquery.checkboxShiftClick',
@@ -1492,13 +1505,13 @@ return array(
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.page.startup' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.startup.js',
+		'scripts' => 'resources/src/mediawiki/page/startup.js',
 		'dependencies' => 'mediawiki.util',
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.page.patrol.ajax' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js',
+		'scripts' => 'resources/src/mediawiki/page/patrol.js',
 		'dependencies' => array(
 			'mediawiki.page.startup',
 			'mediawiki.api',
@@ -1515,11 +1528,10 @@ return array(
 		),
 	),
 	'mediawiki.page.watch.ajax' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.watch.ajax.js',
+		'scripts' => 'resources/src/mediawiki/page/watch.js',
 		'dependencies' => array(
 			'mediawiki.api.watch',
 			'mediawiki.notify',
-			'mediawiki.page.startup',
 			'mediawiki.util',
 			'jquery.accessKeyLabel',
 			'mediawiki.RegExp',
@@ -1535,7 +1547,7 @@ return array(
 		),
 	),
 	'mediawiki.page.image.pagination' => array(
-		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.image.pagination.js',
+		'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
 		'dependencies' => array(
 			'mediawiki.Uri',
 			'mediawiki.util',
@@ -1759,8 +1771,11 @@ return array(
 	'mediawiki.legacy.commonPrint' => array(
 		'position' => 'top',
 		'styles' => array(
+			// @todo: Remove mediawiki.page.gallery when cache has cleared
+			'resources/src/mediawiki/page/gallery-print.css' => array( 'media' => 'print' ),
 			// @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared
-			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' =>
+				array( 'media' => 'print' ),
 			'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 		),
 	),
@@ -1773,6 +1788,8 @@ return array(
 	'mediawiki.legacy.shared' => array(
 		'position' => 'top',
 		'styles' => array(
+			// @todo: Remove when mediawiki.page.gallery in cached html.
+			'resources/src/mediawiki/page/gallery.css',
 			// @todo: Remove mediawiki.action.view.filepage.css
 			// and mediawiki.legacy/images/checker.png when cache has cleared
 			'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
@@ -1877,7 +1894,9 @@ return array(
 			'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
+			'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
+			'resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
@@ -1887,7 +1906,7 @@ return array(
 			'default' => array(
 				'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less',
 				'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less',
-				'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css',
+				'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less',
 			),
 		),
 		'dependencies' => array(