var $skinname = 'monobook', $stylename = 'monobook',
$template = 'MonoBookTemplate', $useHeadElement = true;
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ) {
global $wgHandheldStyle;
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'skins.monobook' );
-
+
// Ugh. Can't do this properly because $wgHandheldStyle may be a URL
if( $wgHandheldStyle ) {
// Currently in testing... try 'chick/main.css'
$out->addStyle( $wgHandheldStyle, 'handheld' );
}
-
- // TODO: Migrate all of these
- //$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' );
- // TODO: migrate
- //$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
+ // TODO: Migrate all of these
+ $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
+ $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
}
}
*/
class MonoBookTemplate extends BaseTemplate {
- /**
- * @var Skin
- */
- var $skin;
-
/**
* Template filter callback for MonoBook skin.
* Takes an associative array of data set from a SkinTemplate-based
* @access private
*/
function execute() {
- $this->skin = $skin = $this->data['skin'];
-
// Suppress warnings to prevent notices about missing indexes in $this->data
wfSuppressWarnings();
$this->html( 'headelement' );
?><div id="globalWrapper">
-<div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>>
+<div id="column-content"><div id="content">
<a id="top"></a>
<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
- <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
- <div id="bodyContent">
+ <h1 id="firstHeading" class="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1>
+ <div id="bodyContent" class="mw-body">
<div id="siteSub"><?php $this->msg('tagline') ?></div>
<div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
<?php if($this->data['undelete']) { ?>
<?php } ?><?php if($this->data['newtalk'] ) { ?>
<div class="usermessage"><?php $this->html('newtalk') ?></div>
<?php } ?><?php if($this->data['showjumplinks']) { ?>
- <div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div>
+ <div id="jump-to-nav"
class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div>
<?php } ?>
<!-- start content -->
<?php $this->html('bodytext') ?>
- <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?>
- <?php $this->html('debughtml'); ?>
<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
<!-- end content -->
<?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
</div>
</div></div>
<div id="column-one"<?php $this->html('userlangattributes') ?>>
-<?php $this->cactions( $skin ); ?>
+<?php $this->cactions(); ?>
<div class="portlet" id="p-personal">
<h5><?php $this->msg('personaltools') ?></h5>
<div class="pBody">
</div>
</div>
<div class="portlet" id="p-logo">
- <?php
- $logoAttribs = array() + Linker::tooltipAndAccesskeyAttribs('p-logo');
- $logoAttribs['style'] = "background-image: url({$this->data['logopath']});";
- $logoAttribs['href'] = $this->data['nav_urls']['mainpage']['href'];
- echo Html::element( 'a', $logoAttribs );
- ?>
+<?php
+ echo Html::element( 'a', array(
+ 'href' => $this->data['nav_urls']['mainpage']['href'],
+ 'style' => "background-image: url({$this->data['logopath']});" )
+ + Linker::tooltipAndAccesskeyAttribs('p-logo') ); ?>
</div>
- <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
<?php
- $sidebar = $this->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 );
- }
- }
+ $this->renderPortals( $this->data['sidebar'] );
?>
</div><!-- end of the left (by default at least) column -->
<div class="visualClear"></div>
+<?php
+ $validFooterIcons = $this->getFooterIcons( "icononly" );
+ $validFooterLinks = $this->getFooterLinks( "flat" ); // Additional footer links
+
+ if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?>
<div id="footer"<?php $this->html('userlangattributes') ?>>
-<?php foreach ( $this->getFooterIcons("icononly") as $blockName => $footerIcons ) { ?>
+<?php
+ $footerEnd = '</div>';
+ } else {
+ $footerEnd = '';
+ }
+ foreach ( $validFooterIcons as $blockName => $footerIcons ) { ?>
<div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
<?php foreach ( $footerIcons as $icon ) { ?>
- <?php echo $this->skin->makeFooterIcon( $icon ); ?>
+ <?php echo $this->getSkin()->makeFooterIcon( $icon ); ?>
<?php }
?>
</div>
<?php }
- // Generate additional footer links
- $validFooterLinks = $this->getFooterLinks("flat");
if ( count( $validFooterLinks ) > 0 ) {
?> <ul id="f-list">
<?php
foreach( $validFooterLinks as $aLink ) { ?>
<li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
-
<?php
}
?>
</ul>
<?php }
+echo $footerEnd;
?>
-</div>
+
</div>
<?php
$this->printTrail();
} // end of execute() method
/*************************************************************************************************/
+
+ /**
+ * @param $sidebar array
+ */
+ protected function renderPortals( $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 => $content ) {
+ if ( $content === false )
+ continue;
+
+ if ( $boxName == 'SEARCH' ) {
+ $this->searchBox();
+ } elseif ( $boxName == 'TOOLBOX' ) {
+ $this->toolbox();
+ } elseif ( $boxName == 'LANGUAGES' ) {
+ $this->languageBox();
+ } else {
+ $this->customBox( $boxName, $content );
+ }
+ }
+ }
+
function searchBox() {
global $wgUseTwoButtonsSearchForm;
?>
* Prints the cactions bar.
* Shared between MonoBook and Modern
*/
- function cactions( Skin $skin ) {
+ function cactions() {
?>
<div id="p-cactions" class="portlet">
<h5><?php $this->msg('views') ?></h5>
<div class="pBody">
<ul><?php
foreach($this->data['content_actions'] as $key => $tab) {
- $linkAttribs = array( 'href' => $tab['href'] );
-
- if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) {
- $title = Linker::titleAttrib( "ca-$key" );
- if ( $title !== false ) {
- $linkAttribs['title'] = $title;
- }
- } else {
- $linkAttribs += Linker::tooltipAndAccesskeyAttribs( "ca-$key" );
- }
- $linkHtml = Html::element( 'a', $linkAttribs, $tab['text'] );
-
- /* Surround with a <li> */
- $liAttribs = array( 'id' => Sanitizer::escapeId( "ca-$key" ) );
- if( $tab['class'] ) {
- $liAttribs['class'] = $tab['class'];
- }
- echo '
- ' . Html::rawElement( 'li', $liAttribs, $linkHtml );
+ echo '
+ ' . $this->makeListItem( $key, $tab );
} ?>
</ul>
<?php
}
wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
- wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
+ wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
?>
</ul>
</div>
}
/*************************************************************************************************/
+ /**
+ * @param $bar string
+ * @param $cont array|string
+ */
function customBox( $bar, $cont ) {
$portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) );
$tooltip = Linker::titleAttrib( "p-$bar" );
echo ' ' . Html::openElement( 'div', $portletAttribs );
?>
- <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
+ <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5>
<div class='pBody'>
<?php if ( is_array( $cont ) ) { ?>
<ul>
dépôts / lhc / web / wiklou.git / blobdiff