Allow specifying OutputPage object in Skin::subPageSubtitle parameters

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 343722d..e31e77e 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -33,6 +33,7 @@ return [
 
        // Scripts managed by the local wiki (stored in the MediaWiki namespace)
        'site' => [ 'class' => 'ResourceLoaderSiteModule' ],
+       'site.styles' => [ 'class' => 'ResourceLoaderSiteStylesModule' ],
        'noscript' => [
                'class' => 'ResourceLoaderWikiModule',
                'styles' => [ 'MediaWiki:Noscript.css' ],
@@ -828,6 +829,9 @@ return [
                                'resources/src/moment-locale-overrides.js',
                        ],
                ],
+               'dependencies' => [
+                       'mediawiki.language',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -1180,6 +1184,7 @@ return [
                ],
                'messages' => [
                        'uploaddisabledtext',
+                       'upload-dialog-disabled',
                        'upload-foreign-cant-upload',
                ]
        ],
@@ -1192,6 +1197,9 @@ return [
                        'mediawiki.ForeignUpload',
                        'mediawiki.ForeignStructuredUpload.config',
                ],
+               'messages' => [
+                       'upload-foreign-cant-load-config',
+               ],
        ],
        'mediawiki.Upload.Dialog' => [
                'scripts' => [
@@ -1373,11 +1381,9 @@ return [
        ],
        'mediawiki.checkboxtoggle' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.js',
-               'position' => 'top',
        ],
        'mediawiki.checkboxtoggle.styles' => [
                'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css',
-               'position' => 'top',
        ],
        'mediawiki.cookie' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
@@ -1402,12 +1408,16 @@ return [
        /* MediaWiki Action */
 
        'mediawiki.action.edit' => [
-               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
+               'scripts' => [
+                       'resources/src/mediawiki.action/mediawiki.action.edit.js',
+                       'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
+               ],
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => [
                        'mediawiki.action.edit.styles',
                        'jquery.textSelection',
                        'jquery.byteLimit',
+                       'mediawiki.api',
                ],
                'position' => 'top',
        ],
@@ -1450,18 +1460,14 @@ return [
                        'previewerrortext',
                ],
        ],
-       'mediawiki.action.edit.stash' => [
-               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
-               'dependencies' => [
-                       'jquery.getAttrs',
-                       'mediawiki.api',
-               ],
-       ],
        'mediawiki.action.history' => [
-               'position' => 'top',
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
        ],
+       'mediawiki.action.history.styles' => [
+               'position' => 'top',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
+       ],
        'mediawiki.action.history.diff' => [
                'position' => 'top',
                'styles' => [
@@ -1791,10 +1797,6 @@ return [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
                'dependencies' => 'mediawiki.util',
        ],
-       'mediawiki.special.blocklist' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css',
-               'position' => 'top',
-       ],
        'mediawiki.special.changeslist' => [
                'position' => 'top',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
@@ -1906,7 +1908,6 @@ return [
                        'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
                ],
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css',
                'messages' => [
                        'widthheight',
                        'size-bytes',
@@ -1919,6 +1920,7 @@ return [
                        'prefs-editing',
                ],
                'dependencies' => [
+                       'mediawiki.special.upload.styles',
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
@@ -1929,6 +1931,9 @@ return [
                        'user.options',
                ],
        ],
+       'mediawiki.special.upload.styles' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
+       ],
        'mediawiki.special.userlogin.common.styles' => [
                'styles' => [
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',