dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge "mediawiki.helplink: Use a SVG+PNG icon"
[lhc/web/wiklou.git] / resources / Resources.php
diff --git a/resources/Resources.php b/resources/Resources.php
index a9f383c..2c80a85 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -29,12 +29,19 @@ return array(
        /**
         * Special modules who have their own classes
         */
+       'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
 
        // Scripts managed by the local wiki (stored in the MediaWiki namespace)
        'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
-       'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
-       'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
-       'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
+       'noscript' => array(
+               'class' => 'ResourceLoaderWikiModule',
+               'styles' => array( 'MediaWiki:Noscript.css' ),
+               'group' => 'noscript',
+       ),
+       'filepage' => array(
+               'class' => 'ResourceLoaderWikiModule',
+               'styles' => array( 'MediaWiki:Filepage.css' ),
+       ),
        'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
 
        // Scripts managed by the current user (stored in their user space)
@@ -178,7 +185,7 @@ return array(
                'styles' => 'resources/lib/jquery.chosen/chosen.css',
        ),
        'jquery.client' => array(
-               'scripts' => 'resources/src/jquery/jquery.client.js',
+               'scripts' => 'resources/lib/jquery.client/jquery.client.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.color' => array(
@@ -765,6 +772,7 @@ return array(
        /* MediaWiki */
 
        'mediawiki' => array(
+               // Keep maintenance/jsduck/eg-iframe.html in sync
                'scripts' => array(
                        'resources/src/mediawiki/mediawiki.js',
                        'resources/src/mediawiki/mediawiki.startUp.js',
@@ -776,9 +784,7 @@ return array(
        'mediawiki.apihelp' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css',
                'targets' => array( 'desktop' ),
-               'dependencies' => array(
-                       'mediawiki.hlist',
-               ),
+               'dependencies' => 'mediawiki.hlist',
                'position' => 'top',
        ),
        'mediawiki.template' => array(
@@ -812,9 +818,12 @@ return array(
        ),
        'mediawiki.api.login' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
-               'dependencies' => array(
-                       'mediawiki.api',
-               ),
+               'dependencies' => 'mediawiki.api',
+       ),
+       'mediawiki.api.options' => array(
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.options.js',
+               'dependencies' => 'mediawiki.api',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.api.parse' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
@@ -888,20 +897,31 @@ return array(
                        'feedback-useragent'
                ),
        ),
-       'mediawiki.hidpi' => array(
-               'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
+
+       'mediawiki.filewarning' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
+               'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
                'dependencies' => array(
-                       'jquery.hidpi',
+                       'oojs-ui',
+               ),
+       ),
+
+       'mediawiki.helplink' => array(
+               'styles' => array(
+                       'resources/src/mediawiki/mediawiki.helplink.less',
                ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'mediawiki.hidpi' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
+               'dependencies' => 'jquery.hidpi',
                'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.hlist' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.hlist.css',
                'scripts' => 'resources/src/mediawiki/mediawiki.hlist.js',
-               'dependencies' => array(
-                       'jquery.client',
-               ),
+               'dependencies' => 'jquery.client',
        ),
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
@@ -933,9 +953,7 @@ return array(
                                => array( 'media' => 'print' ),
                ),
                'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
-               'dependencies' => array(
-                       'mediawiki.page.startup',
-               ),
+               'dependencies' => 'mediawiki.page.startup',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.notify' => array(
@@ -962,14 +980,8 @@ return array(
                ),
        ),
        'mediawiki.sectionAnchor' => array(
-               'skinStyles' => array(
-                       'default' => array(
-                               'resources/src/mediawiki/mediawiki.sectionAnchor.css' =>
-                                       array( 'media' => 'screen'),
-                               'resources/src/mediawiki/mediawiki.sectionAnchor.hide.css' =>
-                                       array( 'media' => 'print' ),
-                       ),
-               ),
+               // Back-compat to hide it on cached pages (T18691; Ie9e334e973; 2015-03-17)
+               'styles' => 'resources/src/mediawiki/mediawiki.sectionAnchor.css',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.Title' => array(
@@ -982,9 +994,7 @@ return array(
        ),
        'mediawiki.toc' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
-               'dependencies' => array(
-                       'jquery.cookie',
-               ),
+               'dependencies' => 'jquery.cookie',
                'messages' => array( 'showtoc', 'hidetoc' ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1022,9 +1032,7 @@ return array(
        ),
        'mediawiki.cookie' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
-               'dependencies' => array(
-                       'jquery.cookie',
-               ),
+               'dependencies' => 'jquery.cookie',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.toolbar' => array(
@@ -1137,9 +1145,7 @@ return array(
        ),
        'mediawiki.action.view.redirect' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.redirect.js',
-               'dependencies' => array(
-                       'jquery.client',
-               ),
+               'dependencies' => 'jquery.client',
                'position' => 'top',
        ),
        'mediawiki.action.view.redirectPage' => array(
@@ -1264,9 +1270,7 @@ return array(
        ),
        'mediawiki.page.startup' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.startup.js',
-               'dependencies' => array(
-                       'mediawiki.util',
-               ),
+               'dependencies' => 'mediawiki.util',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1325,16 +1329,12 @@ return array(
        'mediawiki.special.block' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
-               'dependencies' => array(
-                       'mediawiki.util',
-               ),
+               'dependencies' => 'mediawiki.util',
        ),
        'mediawiki.special.changeemail' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.js',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.css',
-               'dependencies' => array(
-                       'mediawiki.util',
-               ),
+               'dependencies' => 'mediawiki.util',
                'messages' => array(
                        'email-address-validity-valid',
                        'email-address-validity-invalid',
@@ -1385,7 +1385,7 @@ return array(
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
-               'dependencies' => array( 'mediawiki.special' ),
+               'dependencies' => 'mediawiki.special',
                'position' => 'top',
        ),
        'mediawiki.special.search' => array(
@@ -1493,9 +1493,7 @@ return array(
                        'colon-separator',
                        'javascripttest-pagetext-skins',
                ) ),
-               'dependencies' => array(
-                       'mediawiki.Uri',
-               ),
+               'dependencies' => 'mediawiki.Uri',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1529,9 +1527,7 @@ return array(
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
-               'dependencies' => array(
-                       'jquery.byteLimit',
-               ),
+               'dependencies' => 'jquery.byteLimit',
                'messages' => array( 'protect-unchain-permissions' )
        ),
        'mediawiki.legacy.shared' => array(
@@ -1547,9 +1543,7 @@ return array(
        ),
        'mediawiki.legacy.wikibits' => array(
                'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
-               'dependencies' => array(
-                       'mediawiki.util',
-               ),
+               'dependencies' => 'mediawiki.util',
                'position' => 'top',
        ),
 
@@ -1692,4 +1686,127 @@ return array(
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
+
+       'oojs-ui.styles' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.css',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+
+       // FIXME: This is a bit of a mess; T92551 requests fixing
+       'oojs-ui.styles.icons-alerts' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-content' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-editing-advanced' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-editing-core' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-editing-list' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-editing-styling' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-interactions' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-layout' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-location' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-media' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-moderation' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-movement' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-user' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       'oojs-ui.styles.icons-wikimedia' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css',
+               ),
+               'dependencies' => array( 'oojs-ui.styles' ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+
 );
Wiklou, le Wiki du Wiklou