Fix up a couple of deprecated calls
[lhc/web/wiklou.git] / skins / MonoBook.php
index 8afc498..a766e94 100644 (file)
@@ -20,32 +20,33 @@ 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;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
-
                parent::setupSkinUserCss( $out );
 
-               // Append to the default screen common & print styles...
-               $out->addStyle( 'monobook/main.css', 'screen' );
+               $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' );
 
-               $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' );
 
-               $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
        }
 }
 
@@ -53,8 +54,13 @@ class SkinMonoBook extends SkinTemplate {
  * @todo document
  * @ingroup Skins
  */
-class MonoBookTemplate extends QuickTemplate {
+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
@@ -64,121 +70,59 @@ class MonoBookTemplate extends QuickTemplate {
         * @access private
         */
        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'] ?>"><!-- wikibits js --></script>
-               <!-- Head Scripts -->
-<?php $this->html('headscripts') ?>
-<?php  if($this->data['jsvarurl']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"><!-- site js --></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') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
-       <div id="globalWrapper">
-               <div id="column-content">
-       <div id="content">
-               <a name="top" id="top"></a>
-               <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-               <h1 id="firstHeading" class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('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>
-       </div>
-               </div>
-               <div id="column-one">
-       <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) {
-                                       echo '
-                                <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
-                                       if( $tab['class'] ) {
-                                               echo ' class="'.htmlspecialchars($tab['class']).'"';
-                                       }
-                                       echo'><a href="'.htmlspecialchars($tab['href']).'"';
-                                       # We don't want to give the watch tab an accesskey if the
-                                       # page is being edited, because that conflicts with the
-                                       # accesskey on the watch checkbox.  We also don't want to
-                                       # give the edit tab an accesskey, because that's fairly su-
-                                       # perfluous and conflicts with an accesskey (Ctrl-E) often
-                                       # used for editing in Safari.
-                                       if( in_array( $action, array( 'edit', 'submit' ) )
-                                       && in_array( $key, array( 'edit', 'watch', 'unwatch' ))) {
-                                               echo $skin->tooltip( "ca-$key" );
-                                       } else {
-                                               echo $skin->tooltipAndAccesskey( "ca-$key" );
-                                       }
-                                       echo '>'.htmlspecialchars($tab['text']).'</a></li>';
-                               } ?>
-                       </ul>
-               </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">
+               <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']) { ?>
+               <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['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 class="visualClear"></div>
        </div>
+</div></div>
+<div id="column-one"<?php $this->html('userlangattributes')  ?>>
+<?php $this->cactions( $skin ); ?>
        <div class="portlet" id="p-personal">
                <h5><?php $this->msg('personaltools') ?></h5>
                <div class="pBody">
-                       <ul>
-<?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
-                               echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
-                               if(!empty($item['class'])) { ?> class="<?php
-                               echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
-                               echo htmlspecialchars($item['text']) ?></a></li>
-<?php                  } ?>
+                       <ul<?php $this->html('userlangattributes') ?>>
+<?php          foreach($this->getPersonalTools() as $key => $item) { ?>
+                               <?php echo $this->makeListItem($key, $item); ?>
+
+<?php          } ?>
                        </ul>
                </div>
        </div>
        <div class="portlet" id="p-logo">
-               <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
-                       ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
-                       echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a>
+               <?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 );
+               ?>
+
        </div>
        <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 <?php
@@ -198,73 +142,114 @@ class MonoBookTemplate extends QuickTemplate {
                        }
                }
 ?>
-               </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>
 <?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  }
+       $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
+               $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 }
+?>
+       </div>
+<?php }
 
-               // Generate additional footer links
-               $footerlinks = array(
-                       'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
-                       'privacy', 'about', 'disclaimer', 'tagline',
-               );
-               $validFooterLinks = array();
-               foreach( $footerlinks as $aLink ) {
-                       if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-                               $validFooterLinks[] = $aLink;
-                       }
-               }
                if ( count( $validFooterLinks ) > 0 ) {
-?>                     <ul id="f-list">
+?>     <ul id="f-list">
+<?php
+                       foreach( $validFooterLinks as $aLink ) { ?>
+               <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
 <?php
-                       foreach( $validFooterLinks as $aLink ) {
-                               if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>                                     <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
-<?php                  }
                        }
 ?>
-                       </ul>
+       </ul>
 <?php  }
+echo $footerEnd;
 ?>
-               </div>
+
 </div>
-<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
-<?php $this->html('reporttime') ?>
-<?php if ( $this->data['debug'] ): ?>
-<!-- Debug output:
-<?php $this->text( 'debug' ); ?>
-
--->
-<?php endif; ?>
-</body></html>
 <?php
-       wfRestoreWarnings();
+               $this->printTrail();
+               echo Html::closeElement( 'body' );
+               echo Html::closeElement( 'html' );
+               wfRestoreWarnings();
        } // end of execute() method
 
        /*************************************************************************************************/
        function searchBox() {
+               global $wgUseTwoButtonsSearchForm;
 ?>
        <div id="p-search" class="portlet">
                <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
                <div id="searchBody" class="pBody">
-                       <form action="<?php $this->text('searchaction') ?>" id="searchform"><div>
-                               <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search');
-                                       if( isset( $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' ); ?> />&nbsp;
-                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
-                       </div></form>
+                       <form action="<?php $this->text('wgScript') ?>" id="searchform">
+                               <input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/>
+                               <?php echo $this->makeSearchInput(array( "id" => "searchInput" )); ?>
+
+                               <?php echo $this->makeSearchButton("go", array( "id" => "searchGoButton", "class" => "searchButton" ));
+                               if ($wgUseTwoButtonsSearchForm): ?>&#160;
+                               <?php echo $this->makeSearchButton("fulltext", array( "id" => "mw-searchButton", "class" => "searchButton" ));
+                               else: ?>
+
+                               <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php
+                               endif; ?>
+
+                       </form>
                </div>
        </div>
 <?php
        }
 
+       /**
+        * Prints the cactions bar.
+        * Shared between MonoBook and Modern
+        *
+        * @param $skin Skin
+        */
+       function cactions( Skin $skin ) {
+?>
+       <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 );
+                               } ?>
+
+                       </ul>
+               </div>
+       </div>
+<?php
+       }
        /*************************************************************************************************/
        function toolbox() {
 ?>
@@ -273,49 +258,11 @@ class MonoBookTemplate extends QuickTemplate {
                <div class="pBody">
                        <ul>
 <?php
-               if($this->data['notspecialpage']) { ?>
-                               <li id="t-whatlinkshere"><a href="<?php
-                               echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-whatlinkshere') ?>><?php $this->msg('whatlinkshere') ?></a></li>
-<?php
-                       if( $this->data['nav_urls']['recentchangeslinked'] ) { ?>
-                               <li id="t-recentchangeslinked"><a href="<?php
-                               echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked') ?></a></li>
-<?php          }
-               }
-               if(isset($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>
-<?php  }
-               if($this->data['feeds']) { ?>
-                       <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-                                       ?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
-                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
-                                       <?php } ?></li><?php
-               }
-
-               foreach( array('contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
-
-                       if($this->data['nav_urls'][$special]) {
-                               ?><li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-'.$special) ?>><?php $this->msg($special) ?></a></li>
-<?php          }
-               }
-
-               if(!empty($this->data['nav_urls']['print']['href'])) { ?>
-                               <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
-               }
+               foreach ( $this->getToolbox() as $key => $tbitem ) { ?>
+                               <?php echo $this->makeListItem($key, $tbitem); ?>
 
-               if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
-                               <li id="t-permalink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['permalink']['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-permalink') ?>><?php $this->msg('permalink') ?></a></li><?php
-               } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
-                               <li id="t-ispermalink"<?php echo $this->skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php
+<?php
                }
-
                wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
                wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
 ?>
@@ -330,12 +277,12 @@ class MonoBookTemplate extends QuickTemplate {
                if( $this->data['language_urls'] ) {
 ?>
        <div id="p-lang" class="portlet">
-               <h5><?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>
+<?php          foreach($this->data['language_urls'] as $key => $langlink) { ?>
+                               <?php echo $this->makeListItem($key, $langlink); ?>
+
 <?php          } ?>
                        </ul>
                </div>
@@ -346,16 +293,21 @@ class MonoBookTemplate extends QuickTemplate {
 
        /*************************************************************************************************/
        function customBox( $bar, $cont ) {
+               $portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) );
+               $tooltip = Linker::titleAttrib( "p-$bar" );
+               if ( $tooltip !== false ) {
+                       $portletAttribs['title'] = $tooltip;
+               }
+               echo '  ' . Html::openElement( 'div', $portletAttribs );
 ?>
-       <div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
-               <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
+
+               <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5>
                <div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
                        <ul>
 <?php                  foreach($cont as $key => $val) { ?>
-                               <li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php
-                                       if ( $val['active'] ) { ?> class="active" <?php }
-                               ?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li>
+                               <?php echo $this->makeListItem($key, $val); ?>
+
 <?php                  } ?>
                        </ul>
 <?php   } else {
@@ -367,7 +319,6 @@ class MonoBookTemplate extends QuickTemplate {
        </div>
 <?php
        }
-
 } // end of class