jenkins-bot has submitted this change and it was merged.
Change subject: Move assets/ to resources/assets/
......................................................................
Move assets/ to resources/assets/
While it's "semantically" incorrect (these files are not
ResourceLoader resources), putting them in that subdirectory is a lot
less hassle than introducing a new toplevel directory.
Follow-up to 2b4b9a3f. Discussion that resulted in the toplevel
assets/ took place on I6268d663 (now abandoned).
Change-Id: Iedbfd802457fe35803899e3479540177760ec30b
---
M includes/DefaultSettings.php
M includes/PHPVersionError.php
M includes/Setup.php
M includes/filerepo/file/File.php
M includes/installer/Installer.php
M includes/skins/Skin.php
M includes/templates/NoLocalSettings.php
R resources/assets/file-type-icons/COPYING
R resources/assets/file-type-icons/fileicon-c.png
R resources/assets/file-type-icons/fileicon-cpp.png
R resources/assets/file-type-icons/fileicon-deb.png
R resources/assets/file-type-icons/fileicon-djvu.png
R resources/assets/file-type-icons/fileicon-djvu.xcf
R resources/assets/file-type-icons/fileicon-dvi.png
R resources/assets/file-type-icons/fileicon-exe.png
R resources/assets/file-type-icons/fileicon-h.png
R resources/assets/file-type-icons/fileicon-html.png
R resources/assets/file-type-icons/fileicon-iso.png
R resources/assets/file-type-icons/fileicon-java.png
R resources/assets/file-type-icons/fileicon-mid.png
R resources/assets/file-type-icons/fileicon-mov.png
R resources/assets/file-type-icons/fileicon-o.png
R resources/assets/file-type-icons/fileicon-ogg.png
R resources/assets/file-type-icons/fileicon-ogg.xcf
R resources/assets/file-type-icons/fileicon-pdf.png
R resources/assets/file-type-icons/fileicon-ps.png
R resources/assets/file-type-icons/fileicon-psd.png
R resources/assets/file-type-icons/fileicon-rm.png
R resources/assets/file-type-icons/fileicon-rpm.png
R resources/assets/file-type-icons/fileicon-svg.png
R resources/assets/file-type-icons/fileicon-tar.png
R resources/assets/file-type-icons/fileicon-tex.png
R resources/assets/file-type-icons/fileicon-ttf.png
R resources/assets/file-type-icons/fileicon-txt.png
R resources/assets/file-type-icons/fileicon-xcf.png
R resources/assets/file-type-icons/fileicon.png
R resources/assets/licenses/cc-0.png
R resources/assets/licenses/cc-by-nc-sa.png
R resources/assets/licenses/cc-by-sa.png
R resources/assets/licenses/cc-by.png
R resources/assets/licenses/gnu-fdl.png
R resources/assets/licenses/public-domain.png
R resources/assets/mediawiki.png
R resources/assets/poweredby_mediawiki_88x31.png
44 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b29733..5160684 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3102,7 +3102,7 @@
),
"poweredby" => array(
"mediawiki" => array(
- "src" => null, // Defaults to
"$wgScriptPath/assets/poweredby_mediawiki_88x31.png"
+ "src" => null, // Defaults to
"$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png"
"url" => "//www.mediawiki.org/",
"alt" => "Powered by MediaWiki",
)
diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
index 44038a5..f481650 100644
--- a/includes/PHPVersionError.php
+++ b/includes/PHPVersionError.php
@@ -60,7 +60,7 @@
}
$encLogo = htmlspecialchars(
str_replace( '//', '/', $dirname . '/' ) .
- 'assets/mediawiki.png'
+ 'resources/assets/mediawiki.png'
);
header( "$protocol 500 MediaWiki configuration Error" );
diff --git a/includes/Setup.php b/includes/Setup.php
index 78a41d5..cf2df6b 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -106,7 +106,7 @@
if ( $wgRightsIcon ) {
$wgRightsIcon = str_replace(
"{$wgStylePath}/common/images/",
- "{$wgScriptPath}/assets/licenses/",
+ "{$wgScriptPath}/resources/assets/licenses/",
$wgRightsIcon
);
}
@@ -133,7 +133,7 @@
&& $wgFooterIcons['poweredby']['mediawiki']['src'] === null
) {
$wgFooterIcons['poweredby']['mediawiki']['src'] =
- "$wgScriptPath/assets/poweredby_mediawiki_88x31.png";
+ "$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png";
}
/**
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 11a3e5c..08c98bd 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1329,8 +1329,8 @@
*/
function iconThumb() {
global $wgScriptPath, $IP;
- $assetsPath = "$wgScriptPath/assets/file-type-icons/";
- $assetsDirectory = "$IP/assets/file-type-icons/";
+ $assetsPath = "$wgScriptPath/resources/assets/file-type-icons/";
+ $assetsDirectory = "$IP/resources/assets/file-type-icons/";
$try = array( 'fileicon-' . $this->getExtension() . '.png',
'fileicon.png' );
foreach ( $try as $icon ) {
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 544efb6..7d94c2c 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -286,27 +286,27 @@
public $licenses = array(
'cc-by' => array(
'url' => 'http://creativecommons.org/licenses/by/3.0/',
- 'icon' => '{$wgScriptPath}/assets/licenses/cc-by.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/cc-by.png',
),
'cc-by-sa' => array(
'url' =>
'http://creativecommons.org/licenses/by-sa/3.0/',
- 'icon' =>
'{$wgScriptPath}/assets/licenses/cc-by-sa.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/cc-by-sa.png',
),
'cc-by-nc-sa' => array(
'url' =>
'http://creativecommons.org/licenses/by-nc-sa/3.0/',
- 'icon' =>
'{$wgScriptPath}/assets/licenses/cc-by-nc-sa.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/cc-by-nc-sa.png',
),
'cc-0' => array(
'url' =>
'https://creativecommons.org/publicdomain/zero/1.0/',
- 'icon' => '{$wgScriptPath}/assets/licenses/cc-0.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/cc-0.png',
),
'pd' => array(
'url' => '',
- 'icon' =>
'{$wgScriptPath}/assets/licenses/public-domain.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/public-domain.png',
),
'gfdl' => array(
'url' => 'http://www.gnu.org/copyleft/fdl.html',
- 'icon' => '{$wgScriptPath}/assets/licenses/gnu-fdl.png',
+ 'icon' =>
'{$wgScriptPath}/resources/assets/licenses/gnu-fdl.png',
),
'none' => array(
'url' => '',
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 7cabf50..7793f1d 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -829,7 +829,7 @@
function getPoweredBy() {
global $wgScriptPath;
- $url = htmlspecialchars(
"$wgScriptPath/assets/poweredby_mediawiki_88x31.png" );
+ $url = htmlspecialchars(
"$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png" );
$text = '<a href="//www.mediawiki.org/"><img src="' . $url
. '" height="31" width="88" alt="Powered by MediaWiki"
/></a>';
wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );
diff --git a/includes/templates/NoLocalSettings.php
b/includes/templates/NoLocalSettings.php
index 0f9a6ba..5b88dfd 100644
--- a/includes/templates/NoLocalSettings.php
+++ b/includes/templates/NoLocalSettings.php
@@ -72,7 +72,7 @@
</style>
</head>
<body>
- <img src="<?php echo htmlspecialchars( $path )
?>assets/mediawiki.png" alt='The MediaWiki logo' />
+ <img src="<?php echo htmlspecialchars( $path )
?>resources/assets/mediawiki.png" alt='The MediaWiki logo' />
<h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1>
<div class='error'>
diff --git a/assets/file-type-icons/COPYING
b/resources/assets/file-type-icons/COPYING
similarity index 100%
rename from assets/file-type-icons/COPYING
rename to resources/assets/file-type-icons/COPYING
diff --git a/assets/file-type-icons/fileicon-c.png
b/resources/assets/file-type-icons/fileicon-c.png
similarity index 100%
rename from assets/file-type-icons/fileicon-c.png
rename to resources/assets/file-type-icons/fileicon-c.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-cpp.png
b/resources/assets/file-type-icons/fileicon-cpp.png
similarity index 100%
rename from assets/file-type-icons/fileicon-cpp.png
rename to resources/assets/file-type-icons/fileicon-cpp.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-deb.png
b/resources/assets/file-type-icons/fileicon-deb.png
similarity index 100%
rename from assets/file-type-icons/fileicon-deb.png
rename to resources/assets/file-type-icons/fileicon-deb.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-djvu.png
b/resources/assets/file-type-icons/fileicon-djvu.png
similarity index 100%
rename from assets/file-type-icons/fileicon-djvu.png
rename to resources/assets/file-type-icons/fileicon-djvu.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-djvu.xcf
b/resources/assets/file-type-icons/fileicon-djvu.xcf
similarity index 100%
rename from assets/file-type-icons/fileicon-djvu.xcf
rename to resources/assets/file-type-icons/fileicon-djvu.xcf
Binary files differ
diff --git a/assets/file-type-icons/fileicon-dvi.png
b/resources/assets/file-type-icons/fileicon-dvi.png
similarity index 100%
rename from assets/file-type-icons/fileicon-dvi.png
rename to resources/assets/file-type-icons/fileicon-dvi.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-exe.png
b/resources/assets/file-type-icons/fileicon-exe.png
similarity index 100%
rename from assets/file-type-icons/fileicon-exe.png
rename to resources/assets/file-type-icons/fileicon-exe.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-h.png
b/resources/assets/file-type-icons/fileicon-h.png
similarity index 100%
rename from assets/file-type-icons/fileicon-h.png
rename to resources/assets/file-type-icons/fileicon-h.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-html.png
b/resources/assets/file-type-icons/fileicon-html.png
similarity index 100%
rename from assets/file-type-icons/fileicon-html.png
rename to resources/assets/file-type-icons/fileicon-html.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-iso.png
b/resources/assets/file-type-icons/fileicon-iso.png
similarity index 100%
rename from assets/file-type-icons/fileicon-iso.png
rename to resources/assets/file-type-icons/fileicon-iso.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-java.png
b/resources/assets/file-type-icons/fileicon-java.png
similarity index 100%
rename from assets/file-type-icons/fileicon-java.png
rename to resources/assets/file-type-icons/fileicon-java.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-mid.png
b/resources/assets/file-type-icons/fileicon-mid.png
similarity index 100%
rename from assets/file-type-icons/fileicon-mid.png
rename to resources/assets/file-type-icons/fileicon-mid.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-mov.png
b/resources/assets/file-type-icons/fileicon-mov.png
similarity index 100%
rename from assets/file-type-icons/fileicon-mov.png
rename to resources/assets/file-type-icons/fileicon-mov.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-o.png
b/resources/assets/file-type-icons/fileicon-o.png
similarity index 100%
rename from assets/file-type-icons/fileicon-o.png
rename to resources/assets/file-type-icons/fileicon-o.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-ogg.png
b/resources/assets/file-type-icons/fileicon-ogg.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ogg.png
rename to resources/assets/file-type-icons/fileicon-ogg.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-ogg.xcf
b/resources/assets/file-type-icons/fileicon-ogg.xcf
similarity index 100%
rename from assets/file-type-icons/fileicon-ogg.xcf
rename to resources/assets/file-type-icons/fileicon-ogg.xcf
Binary files differ
diff --git a/assets/file-type-icons/fileicon-pdf.png
b/resources/assets/file-type-icons/fileicon-pdf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-pdf.png
rename to resources/assets/file-type-icons/fileicon-pdf.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-ps.png
b/resources/assets/file-type-icons/fileicon-ps.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ps.png
rename to resources/assets/file-type-icons/fileicon-ps.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-psd.png
b/resources/assets/file-type-icons/fileicon-psd.png
similarity index 100%
rename from assets/file-type-icons/fileicon-psd.png
rename to resources/assets/file-type-icons/fileicon-psd.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-rm.png
b/resources/assets/file-type-icons/fileicon-rm.png
similarity index 100%
rename from assets/file-type-icons/fileicon-rm.png
rename to resources/assets/file-type-icons/fileicon-rm.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-rpm.png
b/resources/assets/file-type-icons/fileicon-rpm.png
similarity index 100%
rename from assets/file-type-icons/fileicon-rpm.png
rename to resources/assets/file-type-icons/fileicon-rpm.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-svg.png
b/resources/assets/file-type-icons/fileicon-svg.png
similarity index 100%
rename from assets/file-type-icons/fileicon-svg.png
rename to resources/assets/file-type-icons/fileicon-svg.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-tar.png
b/resources/assets/file-type-icons/fileicon-tar.png
similarity index 100%
rename from assets/file-type-icons/fileicon-tar.png
rename to resources/assets/file-type-icons/fileicon-tar.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-tex.png
b/resources/assets/file-type-icons/fileicon-tex.png
similarity index 100%
rename from assets/file-type-icons/fileicon-tex.png
rename to resources/assets/file-type-icons/fileicon-tex.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-ttf.png
b/resources/assets/file-type-icons/fileicon-ttf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ttf.png
rename to resources/assets/file-type-icons/fileicon-ttf.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-txt.png
b/resources/assets/file-type-icons/fileicon-txt.png
similarity index 100%
rename from assets/file-type-icons/fileicon-txt.png
rename to resources/assets/file-type-icons/fileicon-txt.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon-xcf.png
b/resources/assets/file-type-icons/fileicon-xcf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-xcf.png
rename to resources/assets/file-type-icons/fileicon-xcf.png
Binary files differ
diff --git a/assets/file-type-icons/fileicon.png
b/resources/assets/file-type-icons/fileicon.png
similarity index 100%
rename from assets/file-type-icons/fileicon.png
rename to resources/assets/file-type-icons/fileicon.png
Binary files differ
diff --git a/assets/licenses/cc-0.png b/resources/assets/licenses/cc-0.png
similarity index 100%
rename from assets/licenses/cc-0.png
rename to resources/assets/licenses/cc-0.png
Binary files differ
diff --git a/assets/licenses/cc-by-nc-sa.png
b/resources/assets/licenses/cc-by-nc-sa.png
similarity index 100%
rename from assets/licenses/cc-by-nc-sa.png
rename to resources/assets/licenses/cc-by-nc-sa.png
Binary files differ
diff --git a/assets/licenses/cc-by-sa.png
b/resources/assets/licenses/cc-by-sa.png
similarity index 100%
rename from assets/licenses/cc-by-sa.png
rename to resources/assets/licenses/cc-by-sa.png
Binary files differ
diff --git a/assets/licenses/cc-by.png b/resources/assets/licenses/cc-by.png
similarity index 100%
rename from assets/licenses/cc-by.png
rename to resources/assets/licenses/cc-by.png
Binary files differ
diff --git a/assets/licenses/gnu-fdl.png b/resources/assets/licenses/gnu-fdl.png
similarity index 100%
rename from assets/licenses/gnu-fdl.png
rename to resources/assets/licenses/gnu-fdl.png
Binary files differ
diff --git a/assets/licenses/public-domain.png
b/resources/assets/licenses/public-domain.png
similarity index 100%
rename from assets/licenses/public-domain.png
rename to resources/assets/licenses/public-domain.png
Binary files differ
diff --git a/assets/mediawiki.png b/resources/assets/mediawiki.png
similarity index 100%
rename from assets/mediawiki.png
rename to resources/assets/mediawiki.png
Binary files differ
diff --git a/assets/poweredby_mediawiki_88x31.png
b/resources/assets/poweredby_mediawiki_88x31.png
similarity index 100%
rename from assets/poweredby_mediawiki_88x31.png
rename to resources/assets/poweredby_mediawiki_88x31.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/161030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedbfd802457fe35803899e3479540177760ec30b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
