From a8e474c1f292667fada54613df637999478fb69b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 11 Aug 2014 03:59:22 +0200 Subject: [PATCH] Move installer files from skins/common/ to mw-config/ The CSS and JS files are definitely used only by the installer. As for the images: * mediawiki.png is still used directly by some error pages (includes/PHPVersionError.php, includes/templates/NoLocalSettings.php) * ajax-loader.gif is still used by shared.css * bullet.gif is mysteriously used by *something*, according to the logs at bug 69277 comment 11; I currently have no idea what, so let's keep it here for a while * All other ones don't grep (outside of the installer itself) and don't appear in the logs on bug 69277. Bug: 69277 Change-Id: I9146d9211a807911a5e0cfaa1dd3ab8170f333ca --- includes/installer/WebInstaller.php | 6 +++--- includes/installer/WebInstallerOutput.php | 6 +++--- includes/installer/WebInstallerPage.php | 4 ++-- {skins/common => mw-config}/config-cc.css | 0 {skins/common => mw-config}/config.css | 0 {skins/common => mw-config}/config.js | 0 mw-config/images/ajax-loader.gif | Bin 0 -> 1788 bytes mw-config/images/bullet.gif | Bin 0 -> 50 bytes .../images/critical-32.png | Bin .../images/download-32.png | Bin {skins/common => mw-config}/images/info-32.png | Bin mw-config/images/installer-logo.png | Bin 0 -> 22589 bytes {skins/common => mw-config}/images/tick-32.png | Bin .../common => mw-config}/images/warning-32.png | Bin resources/Resources.php | 17 +++++++++-------- 15 files changed, 17 insertions(+), 16 deletions(-) rename {skins/common => mw-config}/config-cc.css (100%) rename {skins/common => mw-config}/config.css (100%) rename {skins/common => mw-config}/config.js (100%) create mode 100644 mw-config/images/ajax-loader.gif create mode 100644 mw-config/images/bullet.gif rename {skins/common => mw-config}/images/critical-32.png (100%) rename {skins/common => mw-config}/images/download-32.png (100%) rename {skins/common => mw-config}/images/info-32.png (100%) create mode 100644 mw-config/images/installer-logo.png rename {skins/common => mw-config}/images/tick-32.png (100%) rename {skins/common => mw-config}/images/warning-32.png (100%) diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index 68c2ebe36a..3a3e809cc6 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -667,7 +667,7 @@ class WebInstaller extends Installer { * Get HTML for an info box with an icon. * * @param string $text Wikitext, get this with wfMessage()->plain() - * @param string|bool $icon Icon name, file in skins/common/images. Default: false + * @param string|bool $icon Icon name, file in mw-config/images. Default: false * @param string|bool $class Additional class name to add to the wrapper div. Default: false. * * @return string @@ -675,8 +675,8 @@ class WebInstaller extends Installer { public function getInfoBox( $text, $icon = false, $class = false ) { $text = $this->parse( $text, true ); $icon = ( $icon == false ) ? - '../skins/common/images/info-32.png' : - '../skins/common/images/' . $icon; + 'images/info-32.png' : + 'images/' . $icon; $alt = wfMessage( 'config-information' )->text(); return Html::infoBox( $text, $icon, $alt, $class, false ); diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index 0ce20074f3..f797ef9a45 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -265,7 +265,7 @@ class WebInstallerOutput { <?php $this->outputTitle(); ?> getCssUrl() . "\n"; ?> getJQuery() . "\n"; ?> - + $this->getDir() ) ) . "\n"; ?> @@ -290,7 +290,7 @@ class WebInstallerOutput {
@@ -314,7 +314,7 @@ class WebInstallerOutput { <?php $this->outputTitle(); ?> getCssUrl() . "\n"; ?> getJQuery(); ?> - + diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index 9fdee766e6..2a9c54ce1f 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -187,7 +187,7 @@ abstract class WebInstallerPage { protected function startLiveBox() { $this->addHTML( '' . + '
' . '' . '
' . '