http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72148
Revision: 72148
Author: tparscal
Date: 2010-09-01 18:52:42 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Integrated shared and commonPrint modules
Modified Paths:
--------------
branches/resourceloader/phase3/includes/Skin.php
branches/resourceloader/phase3/includes/SkinTemplate.php
branches/resourceloader/phase3/resources/Resources.php
Modified: branches/resourceloader/phase3/includes/Skin.php
===================================================================
--- branches/resourceloader/phase3/includes/Skin.php 2010-09-01 18:52:06 UTC
(rev 72147)
+++ branches/resourceloader/phase3/includes/Skin.php 2010-09-01 18:52:42 UTC
(rev 72148)
@@ -680,8 +680,9 @@
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
- $out->addStyle( 'common/shared.css' );
- $out->addStyle( 'common/oldshared.css' );
+ // This includes the shared.js and oldshared.js files from
skins/common/
+ $out->addModuleStyles( 'mediawiki.legacy.shared' );
+ // TODO: Figure out how to best integrate this stuff into
ResourceLoader
$out->addStyle( $this->getStylesheet() );
$out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
}
Modified: branches/resourceloader/phase3/includes/SkinTemplate.php
===================================================================
--- branches/resourceloader/phase3/includes/SkinTemplate.php 2010-09-01
18:52:06 UTC (rev 72147)
+++ branches/resourceloader/phase3/includes/SkinTemplate.php 2010-09-01
18:52:42 UTC (rev 72148)
@@ -107,8 +107,8 @@
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ){
- $out->addStyle( 'common/shared.css', 'screen' );
- $out->addStyle( 'common/commonPrint.css', 'print' );
+ $out->addModuleStyles( 'mediawiki.legacy.shared' );
+ $out->addModuleStyles( 'mediawiki.legacy.commonPrint' );
}
/**
Modified: branches/resourceloader/phase3/resources/Resources.php
===================================================================
--- branches/resourceloader/phase3/resources/Resources.php 2010-09-01
18:52:06 UTC (rev 72147)
+++ branches/resourceloader/phase3/resources/Resources.php 2010-09-01
18:52:42 UTC (rev 72148)
@@ -291,6 +291,9 @@
'scripts' => 'skins/common/enhancedchanges.js',
'dependencies' => 'mediawiki',
) ),
+ 'mediawiki.legacy.commonPrint' => new ResourceLoaderFileModule( array(
+ 'scripts' => 'skins/common/commonPrint.css',
+ ) ),
'mediawiki.legacy.config' => new ResourceLoaderFileModule( array(
'scripts' => 'skins/common/config.js',
'styles' => array( 'skins/common/config.css',
'skins/common/config-cc.css' ),
@@ -346,6 +349,10 @@
'scripts' => 'skins/common/search.js',
'dependencies' => 'mediawiki',
) ),
+ 'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array(
+ 'scripts' => 'skins/common/shared.css',
+ 'scripts' => 'skins/common/oldshared.css',
+ ) ),
'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array(
'scripts' => 'skins/common/upload.js',
'dependencies' => 'mediawiki',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
