*/
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;
$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
-
- //@@todo we can move this to the parent once we update all skins
- if( isset( $this->pagecss ) && $this->pagecss)
- $out->addInlineStyle( $this->pagecss );
-
- if( isset( $this->usercss ) && $this->usercss)
- $out->addInlineStyle( $this->usercss );
-
- }
- function setupSkinUserJs( OutputPage $out ) {
- parent::setupSkinUserJs( $out );
- $out->addScriptFile( 'wikibits.js' );
-
- //@@todo can move to parent once we update all skins (to not include things twice
- if( isset( $this->jsvarurl ) && $this->jsvarurl)
- $out->addScriptFile( $this->jsvarurl );
-
- if( isset( $this->userjs ) && $this->userjs)
- $out->addScriptFile( $this->userjs );
-
- if( isset( $this->userjsprev ) && $this->userjsprev)
- $out->addInlineScript( $this->userjsprev );
}
}
* @access private
*/
function execute() {
- global $wgRequest, $wgOut, $wgStyleVersion, $wgJsMimeType, $wgStylePath;
+ global $wgRequest;
+
$this->skin = $skin = $this->data['skin'];
$action = $wgRequest->getText( 'action' );
// Suppress warnings to prevent notices about missing indexes in $this->data
wfSuppressWarnings();
- # FIXME: What is this? Should it apply to all skins?
- $path = htmlspecialchars( $wgStylePath );
- $wgOut->addScript( <<<HTML
-<!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script>
- <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-HTML
- );
-
- echo $wgOut->headElement( $this->skin );
-?><body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
-<?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
- class="mediawiki <?php $this->text('dir'); $this->text('capitalizeallnouns') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
- <div id="globalWrapper">
- <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">
- <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
- <div id="contentSub"><?php $this->html('subtitle') ?></div>
- <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php $this->html('undelete') ?></div><?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><?php } ?>
- <!-- start content -->
- <?php $this->html('bodytext') ?>
- <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
- <!-- end content -->
- <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
- <div class="visualClear"></div>
- </div>
+ $this->html( 'headelement' );
+?><div id="globalWrapper">
+<div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>>
+ <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">
+ <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
+ <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
+<?php if($this->data['undelete']) { ?>
+ <div id="contentSub2"><?php $this->html('undelete') ?></div>
+<?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>
+<?php } ?>
+ <!-- start content -->
+<?php $this->html('bodytext') ?>
+ <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+ <!-- end content -->
+ <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
+ <div class="visualClear"></div>
</div>
- </div>
- <div id="column-one">
+</div></div>
+<div id="column-one"<?php $this->html('userlangattributes') ?>>
<div id="p-cactions" class="portlet">
<h5><?php $this->msg('views') ?></h5>
<div class="pBody">
- <ul <?php $this->html('userlangattributes') ?>>
- <?php foreach($this->data['content_actions'] as $key => $tab) {
+ <ul><?php
+ foreach($this->data['content_actions'] as $key => $tab) {
echo '
<li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
if( $tab['class'] ) {
}
echo '>'.htmlspecialchars($tab['text']).'</a></li>';
} ?>
+
</ul>
</div>
</div>
<div class="portlet" id="p-personal">
<h5><?php $this->msg('personaltools') ?></h5>
<div class="pBody">
- <ul <?php $this->html('userlangattributes') ?>>
+ <ul<?php $this->html('userlangattributes') ?>>
<?php foreach($this->data['personal_urls'] as $key => $item) { ?>
<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
}
}
?>
- </div><!-- end of the left (by default at least) column -->
-
<div class="visualClear"></div>
- <div id="footer">
+</div><!-- end of the left (by default at least) column -->
+<div class="visualClear"></div>
+<div id="footer"<?php $this->html('userlangattributes') ?>>
<?php
- if($this->data['poweredbyico']) { ?>
-
<div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
-<?php }
- if($this->data['copyrightico']) { ?>
-
<div id="f-copyrightico"><?php $this->html('copyrightico') ?></div>
-<?php }
+if($this->data['poweredbyico']) { ?>
+ <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
+<?php }
+if($this->data['copyrightico']) { ?>
+ <div id="f-copyrightico"><?php $this->html('copyrightico') ?></div>
+<?php }
// Generate additional footer links
$footerlinks = array(
}
}
if ( count( $validFooterLinks ) > 0 ) {
+?> <ul id="f-list">
<?php
foreach( $validFooterLinks as $aLink ) {
if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?> <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
+?> <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
<?php }
}
?>
- </ul>
+ </ul>
<?php }
?>
- </div>
+</div>
</div>
<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
<?php $this->html('reporttime') ?>
<?php $this->text( 'debug' ); ?>
-->
-<?php endif; ?>
-</body></html>
-<?php
- wfRestoreWarnings();
+<?php endif;
+
+ echo Html::closeElement( 'body' );
+ echo Html::closeElement( 'html' );
+ wfRestoreWarnings();
} // end of execute() method
/*************************************************************************************************/
global $wgUseTwoButtonsSearchForm;
?>
<div id="p-search" class="portlet">
- <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg('search') ?></label></h5>
+ <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
<div id="searchBody" class="pBody">
- <form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
+ <form action="<?php $this->text('wgScript') ?>" id="searchform">
<input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/>
- <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search');
- if( isset( $this->data['search'] ) && $this->data['search'] ) {
- ?> value="<?php $this->text('search') ?>"<?php } ?> />
- <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?>
+ <?php
+ echo Html::input( 'search',
+ isset( $this->data['search'] ) ? $this->data['search'] : '', 'search',
+ array(
+ 'id' => 'searchInput',
+ 'title' => $this->skin->titleAttrib( 'search' ),
+ 'accesskey' => $this->skin->accesskey( 'search' )
+ ) ); ?>
+
+ <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?> 
<input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?>
<div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?>
- </div></form>
+ </form>
</div>
</div>
<?php
function toolbox() {
?>
<div class="portlet" id="p-tb">
- <h5 <?php $this->html('userlangattributes')?>><?php $this->msg('toolbox') ?></h5>
+ <h5><?php $this->msg('toolbox') ?></h5>
<div class="pBody">
<ul>
<?php
if($this->data['feeds']) { ?>
<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
- echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>
+ echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> 
<?php } ?></li><?php
}
if( $this->data['language_urls'] ) {
?>
<div id="p-lang" class="portlet">
- <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5>
+ <h5<?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5>
<div class="pBody">
<ul>
<?php foreach($this->data['language_urls'] as $langlink) { ?>
<li class="<?php echo htmlspecialchars($langlink['class'])?>"><?php
- ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>"><?php echo $langlink['text'] ?></a></li>
+ ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>" title="<?php
+ echo htmlspecialchars($langlink['title']) ?>"><?php echo $langlink['text'] ?></a></li>
<?php } ?>
</ul>
</div>
function customBox( $bar, $cont ) {
?>
<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
- <h5 <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
+ <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
<div class='pBody'>
<?php if ( is_array( $cont ) ) { ?>
<ul>
dépôts / lhc / web / wiklou.git / blobdiff