Fixes to OutputPage's documentation
[lhc/web/wiklou.git] / skins / MonoBook.php
index 00b7141..2bb0dfa 100644 (file)
@@ -20,13 +20,8 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 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;
@@ -40,11 +35,8 @@ class SkinMonoBook extends SkinTemplate {
                        $out->addStyle( $wgHandheldStyle, 'handheld' );
                }
 
-               $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' );
-
                $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
        }
 }
@@ -65,59 +57,23 @@ class MonoBookTemplate extends QuickTemplate {
         */
        function execute() {
                global $wgRequest;
+
                $this->skin = $skin = $this->data['skin'];
                $action = $wgRequest->getText( 'action' );
 
                // Suppress warnings to prevent notices about missing indexes in $this->data
                wfSuppressWarnings();
 
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php
-       foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
-               ?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
-       } ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
-       <head>
-               <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
-               <?php $this->html('headlinks') ?>
-               <title><?php $this->text('pagetitle') ?></title>
-               <?php $this->html('csslinks') ?>
-
-               <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-               <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-
-               <?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-<?php $this->html('headscripts') ?>
-<?php  if($this->data['jsvarurl']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"></script>
-<?php  } ?>
-<?php  if($this->data['pagecss']) { ?>
-               <style type="text/css"><?php $this->html('pagecss') ?></style>
-<?php  }
-               if($this->data['usercss']) { ?>
-               <style type="text/css"><?php $this->html('usercss') ?></style>
-<?php  }
-               if($this->data['userjs']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
-<?php  }
-               if($this->data['userjsprev']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
-<?php  }
-               if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-       </head>
-<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">
+               $this->html( 'headelement' );
+?>     <div id="globalWrapper">
                <div id="column-content">
-       <div id="content">
-               <a name="top" id="top"></a>
+       <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('subtitle') ?></div>
+                       <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 } ?>
@@ -130,11 +86,11 @@ class MonoBookTemplate extends QuickTemplate {
                </div>
        </div>
                </div>
-               <div id="column-one">
+               <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') ?>>
+                       <ul>
        <?php           foreach($this->data['content_actions'] as $key => $tab) {
                                        echo '
                                 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
@@ -199,7 +155,7 @@ class MonoBookTemplate extends QuickTemplate {
 ?>
                </div><!-- end of the left (by default at least) column -->
                        <div class="visualClear"></div>
-                       <div id="footer">
+                       <div id="footer" <?php $this->html('userlangattributes') ?>>
 <?php
                if($this->data['poweredbyico']) { ?>
                                <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
@@ -251,19 +207,25 @@ class MonoBookTemplate extends QuickTemplate {
                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'] ) ) {
-                                               ?> value="<?php $this->text('search') ?>"<?php } ?> />
+                               <?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) { ?>&nbsp;
                                <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
@@ -273,7 +235,7 @@ class MonoBookTemplate extends QuickTemplate {
        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
@@ -288,7 +250,7 @@ class MonoBookTemplate extends QuickTemplate {
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked-toolbox') ?></a></li>
 <?php          }
                }
-               if(isset($this->data['nav_urls']['trackbacklink'])) { ?>
+               if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { ?>
                        <li id="t-trackbacklink"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-trackbacklink') ?>><?php $this->msg('trackbacklink') ?></a></li>
@@ -352,7 +314,7 @@ class MonoBookTemplate extends QuickTemplate {
        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>