X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FModern.php;h=6cc4fc19f260e4b6239356257ddb96fa3ac53f77;hb=ec80d6d43a890758e8e590d7644e64eec592e5e8;hp=e75e4ae82971a490a21e2b1d58d3d71e204b8161;hpb=5c75f383d827a4d2891d42eae8cf870ed0ba17ed;p=lhc%2Fweb%2Fwiklou.git diff --git a/skins/Modern.php b/skins/Modern.php index e75e4ae829..6cc4fc19f2 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -10,26 +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
"; - } - - function initPage( &$out ) { - SkinTemplate::initPage( $out ); - $this->skinname = 'modern'; - $this->stylename = 'modern'; - $this->template = 'ModernTemplate'; + var $skinname = 'modern', $stylename = 'modern', + $template = 'ModernTemplate', $useHeadElement = true; + + 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' ); } } @@ -37,7 +34,7 @@ class SkinModern extends SkinTemplate { * @todo document * @ingroup Skins */ -class ModernTemplate extends QuickTemplate { +class ModernTemplate extends MonoBookTemplate { var $skin; /** * Template filter callback for Modern skin. @@ -48,60 +45,18 @@ class ModernTemplate extends QuickTemplate { * @access private */ function execute() { - global $wgUser; - $this->skin = $skin = $wgUser->getSkin(); + 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') ?> - data['printable']) ) { ?> - - - data['printable']) ) { ?>media="print" href="text('stylepath') ?>/text('stylename') ?>/print.css?" /> - - - data ); ?> - - - -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('nsclass') ?> text('dir') ?> text('pageclass') ?>"> + $this->html( 'headelement' ); +?> -
-

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

-
+

html('title') ?>

@@ -110,12 +65,27 @@ class ModernTemplate extends QuickTemplate {
msg('views') ?>
@@ -125,8 +95,9 @@ class ModernTemplate extends QuickTemplate { -
+
html("specialpageattributes") ?>>
+
msg('tagline') ?>
data['newtalk'] ) { ?>
html('newtalk') ?>
@@ -136,7 +107,7 @@ class ModernTemplate extends QuickTemplate {
-
html('subtitle') ?>
+
html('userlangattributes') ?>>html('subtitle') ?>
data['undelete']) { ?>
html('undelete') ?>
data['showjumplinks']) { ?> @@ -144,15 +115,16 @@ class ModernTemplate extends QuickTemplate { html('bodytext') ?>
data['catlinks']) { $this->html('catlinks'); } ?> + html ('dataAfterContent') ?>
-
+
html("userlangattributes") ?>> - 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; @@ -182,35 +154,39 @@ class ModernTemplate extends QuickTemplate {
msg('personaltools') ?>
- -