From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Feb 2009 13:37:51 +0100 Subject: updated to MediaWiki 1.14.0 --- skins/MonoBook.php | 86 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 33 deletions(-) (limited to 'skins/MonoBook.php') diff --git a/skins/MonoBook.php b/skins/MonoBook.php index a0b3157a..8afc4982 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -20,14 +20,32 @@ if( !defined( 'MEDIAWIKI' ) ) */ class SkinMonoBook extends SkinTemplate { /** Using monobook. */ - function initPage( &$out ) { - SkinTemplate::initPage( $out ); + function initPage( OutputPage $out ) { + parent::initPage( $out ); $this->skinname = 'monobook'; $this->stylename = 'monobook'; $this->template = 'MonoBookTemplate'; - # Bug 14520: skins that just include this file shouldn't load nonexis- - # tent CSS fix files. - $this->cssfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl' ); + + } + + function setupSkinUserCss( OutputPage $out ) { + global $wgHandheldStyle; + + parent::setupSkinUserCss( $out ); + + // Append to the default screen common & print styles... + $out->addStyle( 'monobook/main.css', 'screen' ); + if( $wgHandheldStyle ) { + // Currently in testing... try 'chick/main.css' + $out->addStyle( $wgHandheldStyle, 'handheld' ); + } + + $out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' ); + $out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' ); + $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); + $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); + + $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); } } @@ -54,7 +72,7 @@ class MonoBookTemplate extends QuickTemplate { wfSuppressWarnings(); ?> -data['xhtmlnamespaces'] as $tag => $ns) { ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> @@ -62,20 +80,13 @@ class MonoBookTemplate extends QuickTemplate { html('headlinks') ?> <?php $this->text('pagetitle') ?> - - data['printable']) ) { ?>media="print" href="text('printcss') ?>?" /> - cssfiles ) ) { ?> - cssfiles ) ) { ?> - cssfiles ) ) { ?> - cssfiles ) ) { ?> - - + html('csslinks') ?> + + + data ); ?> - + html('headscripts') ?> @@ -98,13 +109,13 @@ class MonoBookTemplate extends QuickTemplate { data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" data['body_onload']) { ?> onload="text('body_onload') ?>" - class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?>"> + class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>">

data['sitenotice']) { ?>

html('sitenotice') ?>

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

msg('tagline') ?>

html('subtitle') ?>

@@ -115,6 +126,7 @@ class MonoBookTemplate extends QuickTemplate { html('bodytext') ?> data['catlinks']) { $this->html('catlinks'); } ?> + data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>

@@ -126,7 +138,7 @@ class MonoBookTemplate extends QuickTemplate {

- " class="active">tooltipAndAccesskey('pt-'.$key) ?> class="tooltipAndAccesskey('n-mainpage') ?>>

-data['sidebar']; +data['sidebar']; if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; @@ -198,20 +210,28 @@ class MonoBookTemplate extends QuickTemplate { -

html($aLink) ?>

html($aLink) ?>

html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> @@ -271,7 +291,7 @@ class MonoBookTemplate extends QuickTemplate { data['feeds']) { ?>

data['feeds'] as $key => $feed) { - ?>">skin->tooltipAndAccesskey('feed-'.$key) ?>>

data['language_urls'] ) { + if( $this->data['language_urls'] ) { ?>

msg('otherlanguages') ?>

@@ -327,7 +347,7 @@ class MonoBookTemplate extends QuickTemplate { /*************************************************************************************************/ function customBox( $bar, $cont ) { ?> -