| Index: trunk/phase3/skins/Simple.php |
| — | — | @@ -23,6 +23,7 @@ |
| 24 | 24 | $this->skinname = 'simple'; |
| 25 | 25 | $this->stylename = 'simple'; |
| 26 | 26 | $this->template = 'MonoBookTemplate'; |
| | 27 | + $this->cssfiles = array( 'rtl' ); |
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | function reallyDoGetUserStyles() { |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | $this->template = 'MonoBookTemplate'; |
| 29 | 29 | # Bug 14520: skins that just include this file shouldn't load nonexis- |
| 30 | 30 | # tent CSS fix files. |
| 31 | | - $this->fixfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70' ); |
| | 31 | + $this->cssfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl' ); |
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | |
| — | — | @@ -65,11 +65,11 @@ |
| 66 | 66 | @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; |
| 67 | 67 | /*]]>*/</style> |
| 68 | 68 | <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('printcss') ?>?<?php echo $GLOBALS['wgStyleVersion'] ?>" /> |
| 69 | | - <?php if( in_array( 'IE50', $skin->fixfiles ) ) { ?><!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 70 | | - <?php } if( in_array( 'IE55', $skin->fixfiles ) ) { ?><!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 71 | | - <?php } if( in_array( 'IE60', $skin->fixfiles ) ) { ?><!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 72 | | - <?php } if( in_array( 'IE70', $skin->fixfiles ) ) { ?><!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| 73 | | - <?php } ?><!--[if lt IE 7]><?php if( in_array( 'IE', $skin->fixfiles ) ) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script> |
| | 69 | + <?php if( in_array( 'IE50', $skin->cssfiles ) ) { ?><!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 70 | + <?php } if( in_array( 'IE55', $skin->cssfiles ) ) { ?><!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 71 | + <?php } if( in_array( 'IE60', $skin->cssfiles ) ) { ?><!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 72 | + <?php } if( in_array( 'IE70', $skin->cssfiles ) ) { ?><!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]--> |
| | 73 | + <?php } ?><!--[if lt IE 7]><?php if( in_array( 'IE', $skin->cssfiles ) ) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script> |
| 74 | 74 | <?php } ?><meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| 75 | 75 | |
| 76 | 76 | <?php print Skin::makeGlobalVariablesScript( $this->data ); ?> |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -88,10 +88,10 @@ |
| 89 | 89 | var $template; |
| 90 | 90 | |
| 91 | 91 | /** |
| 92 | | - * An array of CSS fixes files to load for IE, in conditional comments. |
| 93 | | - * May include: 'IE', 'IE50', 'IE55', 'IE60', 'IE70'. |
| | 92 | + * An array of strings representing extra CSS files to load. May include: |
| | 93 | + * 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl'. |
| 94 | 94 | */ |
| 95 | | - var $fixfiles; |
| | 95 | + var $cssfiles; |
| 96 | 96 | |
| 97 | 97 | /**#@-*/ |
| 98 | 98 | |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | $this->skinname = 'monobook'; |
| 109 | 109 | $this->stylename = 'monobook'; |
| 110 | 110 | $this->template = 'QuickTemplate'; |
| 111 | | - $this->fixfiles = array(); |
| | 111 | + $this->cssfiles = array(); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
| — | — | @@ -991,7 +991,7 @@ |
| 992 | 992 | $siteargs .= '&ts=' . $wgUser->mTouched; |
| 993 | 993 | } |
| 994 | 994 | |
| 995 | | - if( $wgContLang->isRTL() ) { |
| | 995 | + if( $wgContLang->isRTL() && in_array( 'rtl', $this->cssfiles ) ) { |
| 996 | 996 | global $wgStyleVersion; |
| 997 | 997 | $sitecss .= "@import \"$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion\";\n"; |
| 998 | 998 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -369,7 +369,7 @@ |
| 370 | 370 | recent changes page. |
| 371 | 371 | * (bug 14511) MediaWiki:Delete-legend is no longer double escaped |
| 372 | 372 | * Generate correct section anchors for numeric headers |
| 373 | | -* (bug 14520) Don't load nonexistent CSS fix files for Chick, Myskin, Simple |
| | 373 | +* (bug 14520) Don't load nonexistent CSS files for Chick/Myskin/Simple skins |
| 374 | 374 | |
| 375 | 375 | === API changes in 1.13 === |
| 376 | 376 | |