X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FModern.php;h=add02419c49c7f778b7abcea96140565321b452b;hb=9794985c9d2ef37788d41eac00c30c0ccf3b04d1;hp=f2d957d0fe17ae5c0244d70b792e464be4e3c6b6;hpb=9dd7f340d5315e5fb7a5205050df47c6ac7d792c;p=lhc%2Fweb%2Fwiklou.git diff --git a/skins/Modern.php b/skins/Modern.php index f2d957d0fe..add02419c4 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -3,7 +3,8 @@ * Modern skin, derived from monobook template. * * @todo document - * @addtogroup Skins + * @file + * @ingroup Skins */ if( !defined( 'MEDIAWIKI' ) ) @@ -12,22 +13,36 @@ if( !defined( 'MEDIAWIKI' ) ) /** * Inherit main code from SkinTemplate, set the CSS and template filter. * @todo document - * @addtogroup Skins + * @ingroup Skins */ class SkinModern extends SkinTemplate { - function initPage( &$out ) { - SkinTemplate::initPage( $out ); - $this->skinname = 'modern'; - $this->stylename = 'modern'; - $this->template = 'ModernTemplate'; + var $skinname = 'modern', $stylename = 'modern', + $template = 'ModernTemplate'; + + /* + * 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 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' ); } } /** * @todo document - * @addtogroup Skins + * @ingroup Skins */ class ModernTemplate extends QuickTemplate { + var $skin; /** * Template filter callback for Modern skin. * Takes an associative array of data set from a SkinTemplate-based @@ -37,73 +52,55 @@ class ModernTemplate extends QuickTemplate { * @access private */ function execute() { - global $wgUser; - $skin = $wgUser->getSkin(); + 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(); -?> -data['xhtmlnamespaces'] as $tag => $ns) { - ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> - - - html('headlinks') ?> - <?php $this->text('pagetitle') ?> - - 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') ?>" + $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('nsclass') ?> text('dir') ?> text('pageclass') ?>"> + class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> -
-

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

-
+

html('title') ?>

-
msg('views') ?>
@@ -114,54 +111,134 @@ class ModernTemplate extends QuickTemplate { the content area without affecting the meaning of 'em' in #mw_content, which is used for the margins -->
- data['sitenotice']) { ?>
html('sitenotice') ?>
+
+ +
msg('tagline') ?>
+ data['newtalk'] ) { + ?>
html('newtalk') ?>
+ + data['sitenotice']) { + ?>
html('sitenotice') ?>
+ +
-

msg('tagline') ?>

-
html('subtitle') ?>
+
html('subtitle') ?>
- data['undelete']) { ?>
html('undelete') ?>
- data['newtalk'] ) { ?>
html('newtalk') ?>
- data['showjumplinks']) { ?> + data['undelete']) { ?>
html('undelete') ?>
+ data['showjumplinks']) { ?> - html('bodytext') ?> -
- data['catlinks']) { ?> + html('bodytext') ?> +
+ data['catlinks']) { $this->html('catlinks'); } ?> + html ('dataAfterContent') ?>
- - data['sidebar'] as $bar => $cont) { ?> -
tooltip('p-'.$bar) ?>> -
-
+ + 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 ); + } + } + ?> + +
+ + +
+ +
+ + +
+
msg('personaltools') ?>
+
-
-
- +
+ + + + + + html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> +html('reporttime') ?> +data['debug'] ): ?> + + + + + skin->tooltipAndAccesskey( 'search-go' ); ?> />  + skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> + +
+ + + + +
msg('toolbox') ?>
@@ -171,23 +248,23 @@ class ModernTemplate extends QuickTemplate { if($this->data['notspecialpage']) { ?>
  • tooltipAndAccesskey('t-whatlinkshere') ?>>msg('whatlinkshere') ?>
    • + ?>"skin->tooltipAndAccesskey('t-whatlinkshere') ?>>msg('whatlinkshere') ?> data['nav_urls']['recentchangeslinked'] ) { ?>
  • tooltipAndAccesskey('t-recentchangeslinked') ?>>msg('recentchangeslinked') ?>
    • + ?>"skin->tooltipAndAccesskey('t-recentchangeslinked') ?>>msg('recentchangeslinked-toolbox') ?> data['nav_urls']['trackbacklink'])) { ?> + ?>"skin->tooltipAndAccesskey('t-trackbacklink') ?>>msg('trackbacklink') ?> data['feeds']) { ?> data['nav_urls'][$special]) { ?>
  • tooltipAndAccesskey('t-'.$special) ?>>msg($special) ?>
    • + ?>"skin->tooltipAndAccesskey('t-'.$special) ?>>msg($special) ?> data['nav_urls']['print']['href'])) { ?>
  • tooltipAndAccesskey('t-print') ?>>msg('printableversion') ?>
    • " rel="alternate"skin->tooltipAndAccesskey('t-print') ?>>msg('printableversion') ?>data['nav_urls']['permalink']['href'])) { ?> "skin->tooltipAndAccesskey('t-permalink') ?>>msg('permalink') ?>data['nav_urls']['permalink']['href'] === '') { ?> - skin->tooltip('t-ispermalink') ?>>msg('permalink') ?> -
    - - - + + data['language_urls'] ) { ?> + } + + /*************************************************************************************************/ + function languageBox() { + if( $this->data['language_urls'] ) { +?>
    msg('otherlanguages') ?>
    @@ -227,62 +309,36 @@ class ModernTemplate extends QuickTemplate { ?> -
    -
    - - - - - - - -
    - - -
    -
    msg('personaltools') ?>
    -
    -
    - - - -