Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split mediawiki.legacy.shared into mediawiki.legacy.shared and mediawiki.legacy.oldshared - as it should have been.

Browse source
This commit is contained in:
Trevor Parscal 2010-09-08 00:04:48 +00:00
parent 8c50f16c24
commit a36ac0395c
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Skin.php
View file

@ -723,8 +723,8 @@ CSS;
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
// This includes the shared.js and oldshared.js files from skins/common/
$out->addModuleStyles( 'mediawiki.legacy.shared' );
$out->addModuleStyles( 'mediawiki.legacy.oldshared' );
// TODO: Figure out how to best integrate this stuff into ResourceLoader
$out->addStyle( $this->getStylesheet() );
$out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );

3
includes/SkinTemplate.php
View file

@ -108,7 +108,8 @@ class SkinTemplate extends Skin {
*/
function setupSkinUserCss( OutputPage $out ){
$out->addModuleStyles( 'mediawiki.legacy.shared' );
$out->addModuleStyles( 'mediawiki.legacy.commonPrint' );
// ResourceLoader does not support CSS media types yet, so we must include this on it's own the old way
$out->addStyle( 'common/commonPrint.css', 'print' );
}
/**

5
resources/Resources.php
View file

@ -350,7 +350,10 @@ ResourceLoader::register( array(
'dependencies' => 'mediawiki.legacy.wikibits',
) ),
'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array(
'styles' => array( 'skins/common/shared.css', 'skins/common/oldshared.css' ),
'styles' => 'skins/common/shared.css',
) ),
'mediawiki.legacy.oldshared' => new ResourceLoaderFileModule( array(
'styles' => 'skins/common/oldshared.css',
) ),
'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array(
'scripts' => 'skins/common/upload.js',