From 16c8d893575ba006993220cca9834f5b0ec92a66 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 21:36:06 +0100 Subject: [PATCH] resources: Move the remaining src/mediawiki/ files Single-file modules to src/, the remaining as sub directories. A few highlights: * mediawiki.Upload.BookletLayout. (stylesheet: no image references) * mediawiki.feedback - Also move the image to its own images/ subdir. * mediawiki.searchSuggest. (stylesheet: no image references) * mediawiki.toc. (stylesheet: no image references) Also updated any other references to 'src/mediawiki/' that I could find in core: * Fixed references in docs/uidesign/*.html * Remove redundant exclude from jsduck.json. After this, there are 4 files remaining in src/mediawiki, which are the 4 files used by the actual 'mediawiki' base module. Bug: T193826 Change-Id: I8058652892a78b3f5976397bd850741dd5c92427 --- Gruntfile.js | 2 +- docs/uidesign/design.html | 2 +- docs/uidesign/mediawiki.diff.html | 4 +- jsduck.json | 1 - resources/Resources.php | 72 +++++++++--------- .../BookletLayout.js} | 0 .../BookletLayout.less} | 0 .../Title.js} | 0 .../phpCharToUpper.js} | 0 .../BookletLayout.css} | 0 .../BookletLayout.js} | 0 .../mediawiki.Uri.js => mediawiki.Uri/Uri.js} | 0 .../loose.regexp} | 0 .../strict.regexp} | 0 .../src/{mediawiki => }/mediawiki.apihelp.css | 0 .../mediawiki.confirmCloseWindow.js | 0 .../mediawiki.content.json.less | 0 .../debug.js} | 0 .../debug.less} | 0 .../diff.css} | 0 .../print.css} | 0 .../{mediawiki => }/mediawiki.editfont.less | 0 .../feedback.css} | 2 +- .../feedback.js} | 0 .../images/spinner.gif} | Bin .../feedlink.css} | 0 .../images/feed-icon.png | Bin .../images/feed-icon.svg | 0 .../filewarning.js} | 0 .../filewarning.less} | 0 .../helplink.less} | 0 .../images/help.png | Bin .../images/help.svg | 0 .../hidpi.js} | 0 .../skip.js} | 0 .../default.css} | 0 .../hlist.less} | 0 .../icon.less} | 0 .../images/arrow-collapsed-ltr.png | Bin .../images/arrow-collapsed-ltr.svg | 0 .../images/arrow-collapsed-rtl.png | Bin .../images/arrow-collapsed-rtl.svg | 0 .../images/arrow-expanded.png | Bin .../images/arrow-expanded.svg | 0 .../mediawiki.jqueryMsg.js | 0 .../mediawiki.jqueryMsg.peg | 0 .../TablePager.less} | 0 .../images/arrow-sort-ascending.png | Bin .../images/arrow-sort-ascending.svg | 0 .../images/arrow-sort-descending.png | Bin .../images/arrow-sort-descending.svg | 0 .../searchSuggest.css} | 0 .../searchSuggest.js} | 0 .../mediawiki.template.mustache.js | 0 .../print.css} | 0 .../toc.css} | 0 .../mediawiki.toc.js => mediawiki.toc/toc.js} | 0 57 files changed, 41 insertions(+), 42 deletions(-) rename resources/src/{mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js => mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js} (100%) rename resources/src/{mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less => mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less} (100%) rename resources/src/{mediawiki/mediawiki.Title.js => mediawiki.Title/Title.js} (100%) rename resources/src/{mediawiki/mediawiki.Title.phpCharToUpper.js => mediawiki.Title/phpCharToUpper.js} (100%) rename resources/src/{mediawiki/mediawiki.Upload.BookletLayout.css => mediawiki.Upload.BookletLayout/BookletLayout.css} (100%) rename resources/src/{mediawiki/mediawiki.Upload.BookletLayout.js => mediawiki.Upload.BookletLayout/BookletLayout.js} (100%) rename resources/src/{mediawiki/mediawiki.Uri.js => mediawiki.Uri/Uri.js} (100%) rename resources/src/{mediawiki/mediawiki.Uri.loose.regexp => mediawiki.Uri/loose.regexp} (100%) rename resources/src/{mediawiki/mediawiki.Uri.strict.regexp => mediawiki.Uri/strict.regexp} (100%) rename resources/src/{mediawiki => }/mediawiki.apihelp.css (100%) rename resources/src/{mediawiki => }/mediawiki.confirmCloseWindow.js (100%) rename resources/src/{mediawiki => }/mediawiki.content.json.less (100%) rename resources/src/{mediawiki/mediawiki.debug.js => mediawiki.debug/debug.js} (100%) rename resources/src/{mediawiki/mediawiki.debug.less => mediawiki.debug/debug.less} (100%) rename resources/src/{mediawiki/mediawiki.diff.styles.css => mediawiki.diff.styles/diff.css} (100%) rename resources/src/{mediawiki/mediawiki.diff.styles.print.css => mediawiki.diff.styles/print.css} (100%) rename resources/src/{mediawiki => }/mediawiki.editfont.less (100%) rename resources/src/{mediawiki/mediawiki.feedback.css => mediawiki.feedback/feedback.css} (94%) rename resources/src/{mediawiki/mediawiki.feedback.js => mediawiki.feedback/feedback.js} (100%) rename resources/src/{mediawiki/mediawiki.feedback.spinner.gif => mediawiki.feedback/images/spinner.gif} (100%) rename resources/src/{mediawiki/mediawiki.feedlink.css => mediawiki.feedlink/feedlink.css} (100%) rename resources/src/{mediawiki => mediawiki.feedlink}/images/feed-icon.png (100%) rename resources/src/{mediawiki => mediawiki.feedlink}/images/feed-icon.svg (100%) rename resources/src/{mediawiki/mediawiki.filewarning.js => mediawiki.filewarning/filewarning.js} (100%) rename resources/src/{mediawiki/mediawiki.filewarning.less => mediawiki.filewarning/filewarning.less} (100%) rename resources/src/{mediawiki/mediawiki.helplink.less => mediawiki.helplink/helplink.less} (100%) rename resources/src/{mediawiki => mediawiki.helplink}/images/help.png (100%) rename resources/src/{mediawiki => mediawiki.helplink}/images/help.svg (100%) rename resources/src/{mediawiki/mediawiki.hidpi.js => mediawiki.hidpi/hidpi.js} (100%) rename resources/src/{mediawiki.hidpi-skip.js => mediawiki.hidpi/skip.js} (100%) rename resources/src/{mediawiki/mediawiki.hlist.css => mediawiki.hlist/default.css} (100%) rename resources/src/{mediawiki/mediawiki.hlist-allskins.less => mediawiki.hlist/hlist.less} (100%) rename resources/src/{mediawiki/mediawiki.icon.less => mediawiki.icon/icon.less} (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-collapsed-ltr.png (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-collapsed-ltr.svg (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-collapsed-rtl.png (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-collapsed-rtl.svg (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-expanded.png (100%) rename resources/src/{mediawiki => mediawiki.icon}/images/arrow-expanded.svg (100%) rename resources/src/{mediawiki => mediawiki.jqueryMsg}/mediawiki.jqueryMsg.js (100%) rename resources/src/{mediawiki => mediawiki.jqueryMsg}/mediawiki.jqueryMsg.peg (100%) rename resources/src/{mediawiki/mediawiki.pager.tablePager.less => mediawiki.pager.tablePager/TablePager.less} (100%) rename resources/src/{mediawiki => mediawiki.pager.tablePager}/images/arrow-sort-ascending.png (100%) rename resources/src/{mediawiki => mediawiki.pager.tablePager}/images/arrow-sort-ascending.svg (100%) rename resources/src/{mediawiki => mediawiki.pager.tablePager}/images/arrow-sort-descending.png (100%) rename resources/src/{mediawiki => mediawiki.pager.tablePager}/images/arrow-sort-descending.svg (100%) rename resources/src/{mediawiki/mediawiki.searchSuggest.css => mediawiki.searchSuggest/searchSuggest.css} (100%) rename resources/src/{mediawiki/mediawiki.searchSuggest.js => mediawiki.searchSuggest/searchSuggest.js} (100%) rename resources/src/{mediawiki => }/mediawiki.template.mustache.js (100%) rename resources/src/{mediawiki/mediawiki.toc.print.css => mediawiki.toc/print.css} (100%) rename resources/src/{mediawiki/mediawiki.toc.css => mediawiki.toc/toc.css} (100%) rename resources/src/{mediawiki/mediawiki.toc.js => mediawiki.toc/toc.js} (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 2f5586862f..3687d2805e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -36,7 +36,7 @@ module.exports = function ( grunt ) { '!extensions/**/*.js', '!skins/**/*.js', // Skip functions aren't even parseable - '!resources/src/mediawiki.hidpi-skip.js' + '!resources/src/mediawiki.hidpi/skip.js' ] }, jsonlint: { diff --git a/docs/uidesign/design.html b/docs/uidesign/design.html index 6ab57d7d4f..8395cd5bb7 100644 --- a/docs/uidesign/design.html +++ b/docs/uidesign/design.html @@ -2,7 +2,7 @@ - + diff --git a/docs/uidesign/mediawiki.diff.html b/docs/uidesign/mediawiki.diff.html index cd13dbac20..651cac1661 100644 --- a/docs/uidesign/mediawiki.diff.html +++ b/docs/uidesign/mediawiki.diff.html @@ -2,8 +2,8 @@ - - + + diff --git a/jsduck.json b/jsduck.json index 40af236ff0..18d514f0c6 100644 --- a/jsduck.json +++ b/jsduck.json @@ -21,7 +21,6 @@ "resources/src/mediawiki.legacy", "resources/src/mediawiki.libs.jpegmeta/jpegmeta.js", "resources/src/mediawiki.skinning", - "resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js", "resources/src/startup.js" ], "--": [ diff --git a/resources/Resources.php b/resources/Resources.php index 81a32c2448..ea4e5eafe7 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -865,7 +865,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.apihelp' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css', + 'styles' => 'resources/src/mediawiki.apihelp.css', 'targets' => [ 'desktop' ], ], 'mediawiki.template' => [ @@ -875,7 +875,7 @@ return [ 'mediawiki.template.mustache' => [ 'scripts' => [ 'resources/lib/mustache/mustache.js', - 'resources/src/mediawiki/mediawiki.template.mustache.js', + 'resources/src/mediawiki.template.mustache.js', ], 'targets' => [ 'desktop', 'mobile' ], 'dependencies' => 'mediawiki.template', @@ -961,20 +961,20 @@ return [ ], ], 'mediawiki.content.json' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.content.json.less', + 'styles' => 'resources/src/mediawiki.content.json.less', ], 'mediawiki.confirmCloseWindow' => [ 'scripts' => [ - 'resources/src/mediawiki/mediawiki.confirmCloseWindow.js', + 'resources/src/mediawiki.confirmCloseWindow.js', ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.debug' => [ 'scripts' => [ - 'resources/src/mediawiki/mediawiki.debug.js', + 'resources/src/mediawiki.debug/debug.js', ], 'styles' => [ - 'resources/src/mediawiki/mediawiki.debug.less', + 'resources/src/mediawiki.debug/debug.less', ], 'dependencies' => [ 'jquery.footHovzer', @@ -983,16 +983,16 @@ return [ ], 'mediawiki.diff.styles' => [ 'styles' => [ - 'resources/src/mediawiki/mediawiki.diff.styles.css', - 'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [ + 'resources/src/mediawiki.diff.styles/diff.css', + 'resources/src/mediawiki.diff.styles/print.css' => [ 'media' => 'print' ], ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.feedback' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js', - 'styles' => 'resources/src/mediawiki/mediawiki.feedback.css', + 'scripts' => 'resources/src/mediawiki.feedback/feedback.js', + 'styles' => 'resources/src/mediawiki.feedback/feedback.css', 'dependencies' => [ 'mediawiki.messagePoster', 'mediawiki.Title', @@ -1026,11 +1026,11 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.feedlink' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.feedlink.css', + 'styles' => 'resources/src/mediawiki.feedlink/feedlink.css', ], 'mediawiki.filewarning' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js', - 'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less', + 'scripts' => 'resources/src/mediawiki.filewarning/filewarning.js', + 'styles' => 'resources/src/mediawiki.filewarning/filewarning.less', 'dependencies' => [ 'oojs-ui-core', 'oojs-ui.styles.icons-alerts', @@ -1052,23 +1052,23 @@ return [ ], 'mediawiki.helplink' => [ 'styles' => [ - 'resources/src/mediawiki/mediawiki.helplink.less', + 'resources/src/mediawiki.helplink/helplink.less', ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.hidpi' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js', + 'scripts' => 'resources/src/mediawiki.hidpi/hidpi.js', 'dependencies' => 'jquery.hidpi', - 'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js', + 'skipFunction' => 'resources/src/mediawiki.hidpi/skip.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.hlist' => [ 'targets' => [ 'desktop', 'mobile' ], 'styles' => [ - 'resources/src/mediawiki/mediawiki.hlist-allskins.less', + 'resources/src/mediawiki.hlist/hlist.less', ], 'skinStyles' => [ - 'default' => 'resources/src/mediawiki/mediawiki.hlist.css', + 'default' => 'resources/src/mediawiki.hlist/default.css', ], ], 'mediawiki.htmlform' => [ @@ -1121,7 +1121,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.icon' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.icon.less', + 'styles' => 'resources/src/mediawiki.icon/icon.less', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.inspect' => [ @@ -1196,12 +1196,12 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.pager.tablePager' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.pager.tablePager.less', + 'styles' => 'resources/src/mediawiki.pager.tablePager/TablePager.less', ], 'mediawiki.searchSuggest' => [ 'targets' => [ 'desktop', 'mobile' ], - 'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js', - 'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css', + 'scripts' => 'resources/src/mediawiki.searchSuggest/searchSuggest.js', + 'styles' => 'resources/src/mediawiki.searchSuggest/searchSuggest.css', 'messages' => [ 'searchsuggest-search', 'searchsuggest-containing', @@ -1218,8 +1218,8 @@ return [ ], 'mediawiki.Title' => [ 'scripts' => [ - 'resources/src/mediawiki/mediawiki.Title.js', - 'resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js', + 'resources/src/mediawiki.Title/Title.js', + 'resources/src/mediawiki.Title/phpCharToUpper.js', ], 'dependencies' => [ 'mediawiki.String', @@ -1277,10 +1277,10 @@ return [ ], 'mediawiki.Upload.BookletLayout' => [ 'scripts' => [ - 'resources/src/mediawiki/mediawiki.Upload.BookletLayout.js', + 'resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js', ], 'styles' => [ - 'resources/src/mediawiki/mediawiki.Upload.BookletLayout.css', + 'resources/src/mediawiki.Upload.BookletLayout/BookletLayout.css', ], 'dependencies' => [ 'oojs-ui-core', @@ -1322,8 +1322,8 @@ return [ ], ], 'mediawiki.ForeignStructuredUpload.BookletLayout' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js', - 'styles' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less', + 'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js', + 'styles' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less', 'dependencies' => [ 'mediawiki.ForeignStructuredUpload', 'mediawiki.Upload.BookletLayout', @@ -1347,11 +1347,11 @@ return [ ], ], 'mediawiki.toc' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.toc.js', + 'scripts' => 'resources/src/mediawiki.toc/toc.js', 'styles' => [ - 'resources/src/mediawiki/mediawiki.toc.css' + 'resources/src/mediawiki.toc/toc.css' => [ 'media' => 'screen' ], - 'resources/src/mediawiki/mediawiki.toc.print.css' + 'resources/src/mediawiki.toc/print.css' => [ 'media' => 'print' ], ], 'dependencies' => 'mediawiki.cookie', @@ -1359,10 +1359,10 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.Uri' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js', + 'scripts' => 'resources/src/mediawiki.Uri/Uri.js', 'templates' => [ - 'strict.regexp' => 'resources/src/mediawiki/mediawiki.Uri.strict.regexp', - 'loose.regexp' => 'resources/src/mediawiki/mediawiki.Uri.loose.regexp', + 'strict.regexp' => 'resources/src/mediawiki.Uri/strict.regexp', + 'loose.regexp' => 'resources/src/mediawiki.Uri/loose.regexp', ], 'dependencies' => 'mediawiki.util', 'targets' => [ 'desktop', 'mobile' ], @@ -1421,7 +1421,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.editfont.styles' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.editfont.less', + 'styles' => 'resources/src/mediawiki.editfont.less', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.visibleTimeout' => [ @@ -1641,7 +1641,7 @@ return [ 'mediawiki.jqueryMsg' => [ // Add data for mediawiki.jqueryMsg, such as allowed tags 'class' => ResourceLoaderJqueryMsgModule::class, - 'scripts' => 'resources/src/mediawiki/mediawiki.jqueryMsg.js', + 'scripts' => 'resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js', 'dependencies' => [ 'mediawiki.util', 'mediawiki.language', diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js similarity index 100% rename from resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js rename to resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less similarity index 100% rename from resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less rename to resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less diff --git a/resources/src/mediawiki/mediawiki.Title.js b/resources/src/mediawiki.Title/Title.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Title.js rename to resources/src/mediawiki.Title/Title.js diff --git a/resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js b/resources/src/mediawiki.Title/phpCharToUpper.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js rename to resources/src/mediawiki.Title/phpCharToUpper.js diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.css b/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.css similarity index 100% rename from resources/src/mediawiki/mediawiki.Upload.BookletLayout.css rename to resources/src/mediawiki.Upload.BookletLayout/BookletLayout.css diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Upload.BookletLayout.js rename to resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js diff --git a/resources/src/mediawiki/mediawiki.Uri.js b/resources/src/mediawiki.Uri/Uri.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Uri.js rename to resources/src/mediawiki.Uri/Uri.js diff --git a/resources/src/mediawiki/mediawiki.Uri.loose.regexp b/resources/src/mediawiki.Uri/loose.regexp similarity index 100% rename from resources/src/mediawiki/mediawiki.Uri.loose.regexp rename to resources/src/mediawiki.Uri/loose.regexp diff --git a/resources/src/mediawiki/mediawiki.Uri.strict.regexp b/resources/src/mediawiki.Uri/strict.regexp similarity index 100% rename from resources/src/mediawiki/mediawiki.Uri.strict.regexp rename to resources/src/mediawiki.Uri/strict.regexp diff --git a/resources/src/mediawiki/mediawiki.apihelp.css b/resources/src/mediawiki.apihelp.css similarity index 100% rename from resources/src/mediawiki/mediawiki.apihelp.css rename to resources/src/mediawiki.apihelp.css diff --git a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js b/resources/src/mediawiki.confirmCloseWindow.js similarity index 100% rename from resources/src/mediawiki/mediawiki.confirmCloseWindow.js rename to resources/src/mediawiki.confirmCloseWindow.js diff --git a/resources/src/mediawiki/mediawiki.content.json.less b/resources/src/mediawiki.content.json.less similarity index 100% rename from resources/src/mediawiki/mediawiki.content.json.less rename to resources/src/mediawiki.content.json.less diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki.debug/debug.js similarity index 100% rename from resources/src/mediawiki/mediawiki.debug.js rename to resources/src/mediawiki.debug/debug.js diff --git a/resources/src/mediawiki/mediawiki.debug.less b/resources/src/mediawiki.debug/debug.less similarity index 100% rename from resources/src/mediawiki/mediawiki.debug.less rename to resources/src/mediawiki.debug/debug.less diff --git a/resources/src/mediawiki/mediawiki.diff.styles.css b/resources/src/mediawiki.diff.styles/diff.css similarity index 100% rename from resources/src/mediawiki/mediawiki.diff.styles.css rename to resources/src/mediawiki.diff.styles/diff.css diff --git a/resources/src/mediawiki/mediawiki.diff.styles.print.css b/resources/src/mediawiki.diff.styles/print.css similarity index 100% rename from resources/src/mediawiki/mediawiki.diff.styles.print.css rename to resources/src/mediawiki.diff.styles/print.css diff --git a/resources/src/mediawiki/mediawiki.editfont.less b/resources/src/mediawiki.editfont.less similarity index 100% rename from resources/src/mediawiki/mediawiki.editfont.less rename to resources/src/mediawiki.editfont.less diff --git a/resources/src/mediawiki/mediawiki.feedback.css b/resources/src/mediawiki.feedback/feedback.css similarity index 94% rename from resources/src/mediawiki/mediawiki.feedback.css rename to resources/src/mediawiki.feedback/feedback.css index 57c878e7a9..b39fb826da 100644 --- a/resources/src/mediawiki/mediawiki.feedback.css +++ b/resources/src/mediawiki.feedback/feedback.css @@ -3,7 +3,7 @@ zoom: 1; *display: inline; /* IE7 and below */ /* stylelint-disable declaration-block-no-duplicate-properties */ /* @embed */ - background: url( mediawiki.feedback.spinner.gif ); + background: url( images/spinner.gif ); width: 18px; height: 18px; } diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki.feedback/feedback.js similarity index 100% rename from resources/src/mediawiki/mediawiki.feedback.js rename to resources/src/mediawiki.feedback/feedback.js diff --git a/resources/src/mediawiki/mediawiki.feedback.spinner.gif b/resources/src/mediawiki.feedback/images/spinner.gif similarity index 100% rename from resources/src/mediawiki/mediawiki.feedback.spinner.gif rename to resources/src/mediawiki.feedback/images/spinner.gif diff --git a/resources/src/mediawiki/mediawiki.feedlink.css b/resources/src/mediawiki.feedlink/feedlink.css similarity index 100% rename from resources/src/mediawiki/mediawiki.feedlink.css rename to resources/src/mediawiki.feedlink/feedlink.css diff --git a/resources/src/mediawiki/images/feed-icon.png b/resources/src/mediawiki.feedlink/images/feed-icon.png similarity index 100% rename from resources/src/mediawiki/images/feed-icon.png rename to resources/src/mediawiki.feedlink/images/feed-icon.png diff --git a/resources/src/mediawiki/images/feed-icon.svg b/resources/src/mediawiki.feedlink/images/feed-icon.svg similarity index 100% rename from resources/src/mediawiki/images/feed-icon.svg rename to resources/src/mediawiki.feedlink/images/feed-icon.svg diff --git a/resources/src/mediawiki/mediawiki.filewarning.js b/resources/src/mediawiki.filewarning/filewarning.js similarity index 100% rename from resources/src/mediawiki/mediawiki.filewarning.js rename to resources/src/mediawiki.filewarning/filewarning.js diff --git a/resources/src/mediawiki/mediawiki.filewarning.less b/resources/src/mediawiki.filewarning/filewarning.less similarity index 100% rename from resources/src/mediawiki/mediawiki.filewarning.less rename to resources/src/mediawiki.filewarning/filewarning.less diff --git a/resources/src/mediawiki/mediawiki.helplink.less b/resources/src/mediawiki.helplink/helplink.less similarity index 100% rename from resources/src/mediawiki/mediawiki.helplink.less rename to resources/src/mediawiki.helplink/helplink.less diff --git a/resources/src/mediawiki/images/help.png b/resources/src/mediawiki.helplink/images/help.png similarity index 100% rename from resources/src/mediawiki/images/help.png rename to resources/src/mediawiki.helplink/images/help.png diff --git a/resources/src/mediawiki/images/help.svg b/resources/src/mediawiki.helplink/images/help.svg similarity index 100% rename from resources/src/mediawiki/images/help.svg rename to resources/src/mediawiki.helplink/images/help.svg diff --git a/resources/src/mediawiki/mediawiki.hidpi.js b/resources/src/mediawiki.hidpi/hidpi.js similarity index 100% rename from resources/src/mediawiki/mediawiki.hidpi.js rename to resources/src/mediawiki.hidpi/hidpi.js diff --git a/resources/src/mediawiki.hidpi-skip.js b/resources/src/mediawiki.hidpi/skip.js similarity index 100% rename from resources/src/mediawiki.hidpi-skip.js rename to resources/src/mediawiki.hidpi/skip.js diff --git a/resources/src/mediawiki/mediawiki.hlist.css b/resources/src/mediawiki.hlist/default.css similarity index 100% rename from resources/src/mediawiki/mediawiki.hlist.css rename to resources/src/mediawiki.hlist/default.css diff --git a/resources/src/mediawiki/mediawiki.hlist-allskins.less b/resources/src/mediawiki.hlist/hlist.less similarity index 100% rename from resources/src/mediawiki/mediawiki.hlist-allskins.less rename to resources/src/mediawiki.hlist/hlist.less diff --git a/resources/src/mediawiki/mediawiki.icon.less b/resources/src/mediawiki.icon/icon.less similarity index 100% rename from resources/src/mediawiki/mediawiki.icon.less rename to resources/src/mediawiki.icon/icon.less diff --git a/resources/src/mediawiki/images/arrow-collapsed-ltr.png b/resources/src/mediawiki.icon/images/arrow-collapsed-ltr.png similarity index 100% rename from resources/src/mediawiki/images/arrow-collapsed-ltr.png rename to resources/src/mediawiki.icon/images/arrow-collapsed-ltr.png diff --git a/resources/src/mediawiki/images/arrow-collapsed-ltr.svg b/resources/src/mediawiki.icon/images/arrow-collapsed-ltr.svg similarity index 100% rename from resources/src/mediawiki/images/arrow-collapsed-ltr.svg rename to resources/src/mediawiki.icon/images/arrow-collapsed-ltr.svg diff --git a/resources/src/mediawiki/images/arrow-collapsed-rtl.png b/resources/src/mediawiki.icon/images/arrow-collapsed-rtl.png similarity index 100% rename from resources/src/mediawiki/images/arrow-collapsed-rtl.png rename to resources/src/mediawiki.icon/images/arrow-collapsed-rtl.png diff --git a/resources/src/mediawiki/images/arrow-collapsed-rtl.svg b/resources/src/mediawiki.icon/images/arrow-collapsed-rtl.svg similarity index 100% rename from resources/src/mediawiki/images/arrow-collapsed-rtl.svg rename to resources/src/mediawiki.icon/images/arrow-collapsed-rtl.svg diff --git a/resources/src/mediawiki/images/arrow-expanded.png b/resources/src/mediawiki.icon/images/arrow-expanded.png similarity index 100% rename from resources/src/mediawiki/images/arrow-expanded.png rename to resources/src/mediawiki.icon/images/arrow-expanded.png diff --git a/resources/src/mediawiki/images/arrow-expanded.svg b/resources/src/mediawiki.icon/images/arrow-expanded.svg similarity index 100% rename from resources/src/mediawiki/images/arrow-expanded.svg rename to resources/src/mediawiki.icon/images/arrow-expanded.svg diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js similarity index 100% rename from resources/src/mediawiki/mediawiki.jqueryMsg.js rename to resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.peg b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.peg similarity index 100% rename from resources/src/mediawiki/mediawiki.jqueryMsg.peg rename to resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.peg diff --git a/resources/src/mediawiki/mediawiki.pager.tablePager.less b/resources/src/mediawiki.pager.tablePager/TablePager.less similarity index 100% rename from resources/src/mediawiki/mediawiki.pager.tablePager.less rename to resources/src/mediawiki.pager.tablePager/TablePager.less diff --git a/resources/src/mediawiki/images/arrow-sort-ascending.png b/resources/src/mediawiki.pager.tablePager/images/arrow-sort-ascending.png similarity index 100% rename from resources/src/mediawiki/images/arrow-sort-ascending.png rename to resources/src/mediawiki.pager.tablePager/images/arrow-sort-ascending.png diff --git a/resources/src/mediawiki/images/arrow-sort-ascending.svg b/resources/src/mediawiki.pager.tablePager/images/arrow-sort-ascending.svg similarity index 100% rename from resources/src/mediawiki/images/arrow-sort-ascending.svg rename to resources/src/mediawiki.pager.tablePager/images/arrow-sort-ascending.svg diff --git a/resources/src/mediawiki/images/arrow-sort-descending.png b/resources/src/mediawiki.pager.tablePager/images/arrow-sort-descending.png similarity index 100% rename from resources/src/mediawiki/images/arrow-sort-descending.png rename to resources/src/mediawiki.pager.tablePager/images/arrow-sort-descending.png diff --git a/resources/src/mediawiki/images/arrow-sort-descending.svg b/resources/src/mediawiki.pager.tablePager/images/arrow-sort-descending.svg similarity index 100% rename from resources/src/mediawiki/images/arrow-sort-descending.svg rename to resources/src/mediawiki.pager.tablePager/images/arrow-sort-descending.svg diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.css b/resources/src/mediawiki.searchSuggest/searchSuggest.css similarity index 100% rename from resources/src/mediawiki/mediawiki.searchSuggest.css rename to resources/src/mediawiki.searchSuggest/searchSuggest.css diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js b/resources/src/mediawiki.searchSuggest/searchSuggest.js similarity index 100% rename from resources/src/mediawiki/mediawiki.searchSuggest.js rename to resources/src/mediawiki.searchSuggest/searchSuggest.js diff --git a/resources/src/mediawiki/mediawiki.template.mustache.js b/resources/src/mediawiki.template.mustache.js similarity index 100% rename from resources/src/mediawiki/mediawiki.template.mustache.js rename to resources/src/mediawiki.template.mustache.js diff --git a/resources/src/mediawiki/mediawiki.toc.print.css b/resources/src/mediawiki.toc/print.css similarity index 100% rename from resources/src/mediawiki/mediawiki.toc.print.css rename to resources/src/mediawiki.toc/print.css diff --git a/resources/src/mediawiki/mediawiki.toc.css b/resources/src/mediawiki.toc/toc.css similarity index 100% rename from resources/src/mediawiki/mediawiki.toc.css rename to resources/src/mediawiki.toc/toc.css diff --git a/resources/src/mediawiki/mediawiki.toc.js b/resources/src/mediawiki.toc/toc.js similarity index 100% rename from resources/src/mediawiki/mediawiki.toc.js rename to resources/src/mediawiki.toc/toc.js -- 2.20.1