From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 28 Jul 2010 11:52:48 +0200 Subject: update to MediaWiki 1.16.0 --- skins/MonoBook.php | 154 +++++++++++++++++++++-------------------------------- 1 file changed, 61 insertions(+), 93 deletions(-) (limited to 'skins/MonoBook.php') diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 2312de0f..fdc1684d 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -20,13 +20,8 @@ if( !defined( 'MEDIAWIKI' ) ) */ class SkinMonoBook extends SkinTemplate { /** Using monobook. */ - function initPage( OutputPage $out ) { - parent::initPage( $out ); - $this->skinname = 'monobook'; - $this->stylename = 'monobook'; - $this->template = 'MonoBookTemplate'; - - } + var $skinname = 'monobook', $stylename = 'monobook', + $template = 'MonoBookTemplate', $useHeadElement = true; function setupSkinUserCss( OutputPage $out ) { global $wgHandheldStyle; @@ -46,6 +41,7 @@ class SkinMonoBook extends SkinTemplate { $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); + } } @@ -65,84 +61,50 @@ class MonoBookTemplate extends QuickTemplate { */ function execute() { global $wgRequest; + $this->skin = $skin = $this->data['skin']; $action = $wgRequest->getText( 'action' ); // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); -?> -data['xhtmlnamespaces'] as $tag => $ns) { - ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> - - - html('headlinks') ?> - <?php $this->text('pagetitle') ?> - html('csslinks') ?> - - - - data ); ?> + $this->html( 'headelement' ); +?>
+
html("specialpageattributes") ?>> + + data['sitenotice']) { ?>
html('sitenotice') ?>
- - -html('headscripts') ?> -data['jsvarurl']) { ?> - - -data['pagecss']) { ?> - -data['usercss']) { ?> - -data['userjs']) { ?> - -data['userjsprev']) { ?> - -data['trackbackhtml']) print $this->data['trackbackhtml']; ?> - -data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" -data['body_onload']) { ?> onload="text('body_onload') ?>" - class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> -
-
-
- - data['sitenotice']) { ?>
html('sitenotice') ?>
-

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

-
-

msg('tagline') ?>

-
html('subtitle') ?>
- data['undelete']) { ?>
html('undelete') ?>
- data['newtalk'] ) { ?>
html('newtalk') ?>
- data['showjumplinks']) { ?> - - html('bodytext') ?> - data['catlinks']) { $this->html('catlinks'); } ?> - - data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> -
-
+

html('title') ?>

+
+

msg('tagline') ?>

+
html('userlangattributes') ?>>html('subtitle') ?>
+data['undelete']) { ?> +
html('undelete') ?>
+data['newtalk'] ) { ?> +
html('newtalk') ?>
+data['showjumplinks']) { ?> + + + +html('bodytext') ?> + data['catlinks']) { $this->html('catlinks'); } ?> + + data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> +
-
-
+
+
html('userlangattributes') ?>>
msg('views') ?>
-
html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> html('reporttime') ?> @@ -254,17 +217,23 @@ class MonoBookTemplate extends QuickTemplate { data['nav_urls']['recentchangeslinked'] ) { ?>
  • skin->tooltipAndAccesskey('t-recentchangeslinked') ?>>msg('recentchangeslinked') ?>
    • + ?>"skin->tooltipAndAccesskey('t-recentchangeslinked') ?>>msg('recentchangeslinked-toolbox') ?> data['nav_urls']['trackbacklink'])) { ?> + if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { ?> @@ -335,7 +304,7 @@ class MonoBookTemplate extends QuickTemplate { if( $this->data['language_urls'] ) { ?>
    -
    msg('otherlanguages') ?>
    + html('userlangattributes') ?>>msg('otherlanguages') ?>
      data['language_urls'] as $langlink) { ?> @@ -353,7 +322,7 @@ class MonoBookTemplate extends QuickTemplate { function customBox( $bar, $cont ) { ?>
      skin->tooltip('p-'.$bar) ?>> -
      +
        @@ -372,7 +341,6 @@ class MonoBookTemplate extends QuickTemplate {