X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=skins%2FModern.php;h=ebd574f435fe7b9f9e0b8a4cb84970207644c5cc;hb=5343b3eb3e4e11634be5e161120d879cd80bf70c;hp=c49342eca49ee30555197c70507b04ffeac0d33c;hpb=7dccaf159b2fd18b2761b1fd48b6b17ac5888072;p=lhc%2Fweb%2Fwiklou.git diff --git a/skins/Modern.php b/skins/Modern.php index c49342eca4..ebd574f435 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -10,34 +10,23 @@ if( !defined( 'MEDIAWIKI' ) ) die( -1 ); +require( dirname(__FILE__) . '/MonoBook.php' ); + /** * Inherit main code from SkinTemplate, set the CSS and template filter. * @todo document * @ingroup Skins */ class SkinModern extends SkinTemplate { - /* - * We don't like the default getPoweredBy, the icon clashes with the - * skin L&F. - */ - function getPoweredBy() { - global $wgVersion; - return "
Powered by MediaWiki $wgVersion
"; - } + var $skinname = 'modern', $stylename = 'modern', + $template = 'ModernTemplate', $useHeadElement = true; - function initPage( OutputPage $out ) { - parent::initPage( $out ); - $this->skinname = 'modern'; - $this->stylename = 'modern'; - $this->template = 'ModernTemplate'; - } - + /** + * @param $out OutputPage + */ function setupSkinUserCss( OutputPage $out ){ - // Do not call parent::setupSkinUserCss(), we have our own print style - $out->addStyle( 'common/shared.css', 'screen' ); - $out->addStyle( 'modern/main.css', 'screen' ); - $out->addStyle( 'modern/print.css', 'print' ); - $out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' ); + parent::setupSkinUserCss( $out ); + $out->addModuleStyles ('skins.modern'); } } @@ -45,8 +34,8 @@ class SkinModern extends SkinTemplate { * @todo document * @ingroup Skins */ -class ModernTemplate extends QuickTemplate { - var $skin; +class ModernTemplate extends MonoBookTemplate { + /** * Template filter callback for Modern skin. * Takes an associative array of data set from a SkinTemplate-based @@ -56,58 +45,19 @@ class ModernTemplate extends QuickTemplate { * @access private */ function execute() { - global $wgRequest, $wgOut; - $this->skin = $skin = $this->data['skin']; - $action = $wgRequest->getText( 'action' ); - // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); - $wgOut->addScript( << - -HTML - ); - - echo $wgOut->headElement( $this->skin ); -?>data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" -data['body_onload' ]) { ?> onload="text('body_onload') ?>" - class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> + $this->html( 'headelement' ); +?> -

html('title') ?>

+

html('title') ?>

-
-
msg('views') ?>
-
- -
-
+cactions(); ?>
@@ -116,7 +66,7 @@ HTML for the margins -->
- +
msg('tagline') ?>
data['newtalk'] ) { ?>
html('newtalk') ?>
@@ -126,7 +76,7 @@ HTML
-
html('subtitle') ?>
+
html('userlangattributes') ?>>html('subtitle') ?>
data['undelete']) { ?>
html('undelete') ?>
data['showjumplinks']) { ?> @@ -139,27 +89,10 @@ HTML
-
+
html("userlangattributes") ?>> - data['sidebar']; - if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; - if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; - if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; - - foreach ($sidebar as $boxName => $cont) { - if ( $boxName == 'SEARCH' ) { - $this->searchBox(); - } elseif ( $boxName == 'TOOLBOX' ) { - $this->toolbox(); - } elseif ( $boxName == 'LANGUAGES' ) { - $this->languageBox(); - } else { - $this->customBox( $boxName, $cont ); - } - } - ?> + renderPortals( $this->data['sidebar'] ); ?>
@@ -173,176 +106,46 @@ HTML
msg('personaltools') ?>
- -