X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=132a15abd2e387aba3bfb9f22f4af15ae3c34df2;hb=7afc5cf735a9c1e9c96c62ff227571d03f53b454;hp=ea4e5eafe72d646ce146cf012fa7b9245385790f;hpb=45258656abbc48d0a5b2ab0caee94085d2ae7c68;p=lhc%2Fweb%2Fwiklou.git diff --git a/resources/Resources.php b/resources/Resources.php index ea4e5eafe7..132a15abd2 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -303,8 +303,8 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'jquery.spinner' => [ - 'scripts' => 'resources/src/jquery/jquery.spinner.js', - 'styles' => 'resources/src/jquery/jquery.spinner.css', + 'scripts' => 'resources/src/jquery.spinner/spinner.js', + 'styles' => 'resources/src/jquery.spinner/spinner.css', 'targets' => [ 'desktop', 'mobile' ], ], 'jquery.jStorage' => [ @@ -1994,18 +1994,21 @@ return [ ], 'mediawiki.special' => [ 'styles' => [ - 'resources/src/mediawiki.special/mediawiki.special.css', - 'resources/src/mediawiki.special/mediawiki.special.userrights.css', + 'resources/src/mediawiki.special/special.css', + 'resources/src/mediawiki.special/apisandbox.css', + 'resources/src/mediawiki.special/comparepages.less', + 'resources/src/mediawiki.special/edittags.css', + 'resources/src/mediawiki.special/movePage.css', + 'resources/src/mediawiki.special/pagesWithProp.css', + 'resources/src/mediawiki.special/upload.css', + 'resources/src/mediawiki.special/userrights.css', + 'resources/src/mediawiki.special/watchlist.css', ], 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.special.apisandbox.styles' => [ - 'targets' => [ 'desktop', 'mobile' ], - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css', - ], 'mediawiki.special.apisandbox' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.css', - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.js', + 'styles' => 'resources/src/mediawiki.special.apisandbox/apisandbox.css', + 'scripts' => 'resources/src/mediawiki.special.apisandbox/apisandbox.js', 'targets' => [ 'desktop', 'mobile' ], 'dependencies' => [ 'mediawiki.api', @@ -2034,6 +2037,7 @@ return [ 'apisandbox-dynamic-parameters-add-label', 'apisandbox-dynamic-parameters-add-placeholder', 'apisandbox-dynamic-error-exists', + 'apisandbox-templated-parameter-reason', 'apisandbox-deprecated-parameters', 'apisandbox-no-parameters', 'api-help-param-limit', @@ -2070,10 +2074,13 @@ return [ 'apisandbox-multivalue-all-values', 'api-format-prettyprint-status', 'blanknamespace', + 'comma-separator', + 'word-separator', + 'and' ], ], 'mediawiki.special.block' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js', + 'scripts' => 'resources/src/mediawiki.special.block.js', 'dependencies' => [ 'oojs-ui-core', 'oojs-ui.styles.icons-editing-core', @@ -2086,7 +2093,7 @@ return [ ], ], 'mediawiki.special.changecredentials.js' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changecredentials.js', + 'scripts' => 'resources/src/mediawiki.special.changecredentials.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.htmlform.ooui' @@ -2094,39 +2101,33 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.changeslist' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css', + 'styles' => 'resources/src/mediawiki.special.changeslist.css', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.changeslist.enhanced' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css', + 'styles' => 'resources/src/mediawiki.special.changeslist.enhanced.css', ], 'mediawiki.special.changeslist.legend' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css', + 'styles' => 'resources/src/mediawiki.special.changeslist.legend.css', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.changeslist.legend.js' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js', + 'scripts' => 'resources/src/mediawiki.special.changeslist.legend.js', 'dependencies' => [ 'jquery.makeCollapsible', 'mediawiki.cookie', ], 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.special.changeslist.visitedstatus' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js', - ], - 'mediawiki.special.comparepages.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less', - ], 'mediawiki.special.contributions' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.contributions.js', + 'scripts' => 'resources/src/mediawiki.special.contributions.js', 'dependencies' => [ 'mediawiki.widgets.DateInputWidget', 'mediawiki.jqueryMsg', ] ], 'mediawiki.special.edittags' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.edittags.js', + 'scripts' => 'resources/src/mediawiki.special.edittags.js', 'dependencies' => [ 'jquery.chosen', 'jquery.lengthLimit', @@ -2136,39 +2137,30 @@ return [ 'tags-edit-chosen-no-results', ], ], - 'mediawiki.special.edittags.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.edittags.css', - ], 'mediawiki.special.import' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.import.js', + 'scripts' => 'resources/src/mediawiki.special.import.js', ], 'mediawiki.special.movePage' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js', + 'scripts' => 'resources/src/mediawiki.special.movePage.js', 'dependencies' => [ 'mediawiki.widgets.visibleLengthLimit', 'mediawiki.widgets', ], ], - 'mediawiki.special.movePage.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css', - ], 'mediawiki.special.pageLanguage' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js', + 'scripts' => 'resources/src/mediawiki.special.pageLanguage.js', 'dependencies' => [ 'oojs-ui-core', ], ], - 'mediawiki.special.pagesWithProp' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css', - ], 'mediawiki.special.preferences' => [ 'targets' => [ 'desktop', 'mobile' ], 'scripts' => [ - 'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js', + 'resources/src/mediawiki.special.preferences/confirmClose.js', + 'resources/src/mediawiki.special.preferences/convertmessagebox.js', + 'resources/src/mediawiki.special.preferences/tabs.legacy.js', + 'resources/src/mediawiki.special.preferences/timezone.js', + 'resources/src/mediawiki.special.preferences/personalEmail.js', ], 'messages' => [ 'prefs-tabs-navigation-hint', @@ -2184,17 +2176,19 @@ return [ ], 'mediawiki.special.preferences.styles' => [ 'targets' => [ 'desktop', 'mobile' ], - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css', + // legacy + 'styles' => 'resources/src/mediawiki.special.preferences.styles.css', ], 'mediawiki.special.preferences.ooui' => [ 'targets' => [ 'desktop', 'mobile' ], 'scripts' => [ - 'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js', - 'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js', + // FIXME: This uses files already belonging to another module + 'resources/src/mediawiki.special.preferences/confirmClose.js', + 'resources/src/mediawiki.special.preferences/convertmessagebox.js', + 'resources/src/mediawiki.special.preferences.ooui/editfont.js', + 'resources/src/mediawiki.special.preferences.ooui/tabs.js', + 'resources/src/mediawiki.special.preferences/timezone.js', + 'resources/src/mediawiki.special.preferences/personalEmail.js', ], 'messages' => [ 'prefs-tabs-navigation-hint', @@ -2213,14 +2207,14 @@ return [ ], 'mediawiki.special.preferences.styles.ooui' => [ 'targets' => [ 'desktop', 'mobile' ], - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css', + 'styles' => 'resources/src/mediawiki.special.preferences.styles.ooui.css', ], 'mediawiki.special.recentchanges' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js', + 'scripts' => 'resources/src/mediawiki.special.recentchanges.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.revisionDelete' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.revisionDelete.js', + 'scripts' => 'resources/src/mediawiki.special.revisionDelete.js', 'messages' => [ // @todo Load this message in content language 'colon-separator', @@ -2231,8 +2225,8 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.search' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.js', - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.css', + 'scripts' => 'resources/src/mediawiki.special.search/search.js', + 'styles' => 'resources/src/mediawiki.special.search/search.css', 'dependencies' => 'mediawiki.widgets.SearchInputWidget', 'messages' => [ 'powersearch-togglelabel', @@ -2241,7 +2235,7 @@ return [ ], ], 'mediawiki.special.search.commonsInterwikiWidget' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js', + 'scripts' => 'resources/src/mediawiki.special.search.commonsInterwikiWidget.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.Uri', @@ -2254,24 +2248,23 @@ return [ ], ], 'mediawiki.special.search.interwikiwidget.styles' => [ - 'styles' => 'resources/src/mediawiki.special/' - . 'mediawiki.special.search.interwikiwidget.styles.less', + 'styles' => 'resources/src/mediawiki.special.search.interwikiwidget.styles.less', 'targets' => [ 'desktop', 'mobile' ] ], 'mediawiki.special.search.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css', + 'styles' => 'resources/src/mediawiki.special.search.styles.css', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.undelete' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js', + 'scripts' => 'resources/src/mediawiki.special.undelete.js', 'dependencies' => [ 'mediawiki.widgets.visibleLengthLimit', 'mediawiki.widgets', ], ], 'mediawiki.special.unwatchedPages' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js', - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css', + 'scripts' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js', + 'styles' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css', 'messages' => [ 'addedwatchtext-short', 'removedwatchtext-short', @@ -2291,9 +2284,9 @@ return [ ], 'mediawiki.special.upload' => [ 'templates' => [ - 'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html', + 'thumbnail.html' => 'resources/src/mediawiki.special.upload/templates/thumbnail.html', ], - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js', + 'scripts' => 'resources/src/mediawiki.special.upload/upload.js', 'messages' => [ 'widthheight', 'size-bytes', @@ -2306,7 +2299,7 @@ return [ 'prefs-editing', ], 'dependencies' => [ - 'mediawiki.special.upload.styles', + 'mediawiki.special', 'jquery.spinner', 'mediawiki.jqueryMsg', 'mediawiki.api', @@ -2318,22 +2311,19 @@ return [ 'user.options', ], ], - 'mediawiki.special.upload.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css', - ], 'mediawiki.special.userlogin.common.styles' => [ 'targets' => [ 'desktop', 'mobile' ], 'skinStyles' => [ - 'default' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css', + 'default' => 'resources/src/mediawiki.special.userlogin.common.styles/userlogin.css', ], ], 'mediawiki.special.userlogin.login.styles' => [ 'styles' => [ - 'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css', + 'resources/src/mediawiki.special.userlogin.login.styles/login.css', ], ], 'mediawiki.special.userlogin.signup.js' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js', + 'scripts' => 'resources/src/mediawiki.special.userlogin.signup.js', 'messages' => [ 'createacct-emailrequired', 'noname', @@ -2348,18 +2338,21 @@ return [ ], 'mediawiki.special.userlogin.signup.styles' => [ 'styles' => [ - 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css', + 'resources/src/mediawiki.special.userlogin.signup.styles/signup.css', ], ], 'mediawiki.special.userrights' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js', + 'scripts' => 'resources/src/mediawiki.special.userrights.js', 'dependencies' => [ 'mediawiki.notification.convertmessagebox', 'jquery.lengthLimit', ], ], 'mediawiki.special.watchlist' => [ - 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js', + 'scripts' => [ + 'resources/src/mediawiki.special.watchlist/watchlist.js', + 'resources/src/mediawiki.special.watchlist/visitedstatus.js', + ], 'messages' => [ 'addedwatchtext', 'addedwatchtext-talk', @@ -2379,11 +2372,8 @@ return [ 'user.options', ], ], - 'mediawiki.special.watchlist.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.css', - ], 'mediawiki.special.version' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css', + 'styles' => 'resources/src/mediawiki.special.version.css', ], /* MediaWiki Installer */ @@ -2898,9 +2888,9 @@ return [ 'oojs-ui-widgets' => [ 'class' => ResourceLoaderOOUIFileModule::class, 'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js', - 'themeStyles' => 'widgets', 'dependencies' => [ 'oojs-ui-core', + 'oojs-ui-widgets.styles', 'oojs-ui.styles.icons-interactions', 'oojs-ui.styles.icons-content', 'oojs-ui.styles.icons-editing-advanced', @@ -2919,6 +2909,14 @@ return [ ], 'targets' => [ 'desktop', 'mobile' ], ], + // You should never directly load this module. The CSS classes it defines are not a public API, + // they depend on the internal structure of OOUI widgets, which can change at any time. If you + // find that you need to load this module, you're probably doing something wrong or very hacky. + 'oojs-ui-widgets.styles' => [ + 'class' => ResourceLoaderOOUIFileModule::class, + 'themeStyles' => 'widgets', + 'targets' => [ 'desktop', 'mobile' ], + ], // Toolbar and tools module. 'oojs-ui-toolbars' => [ 'class' => ResourceLoaderOOUIFileModule::class,