]> xenbits.xensource.com Git - people/larsk/xenproject-org-websites.git/commitdiff
Added latest html skin from contractor and deleted zip file added by mistake
authorlarsk <lars.kurth@citrix.com>
Thu, 27 Jun 2013 11:08:11 +0000 (12:08 +0100)
committerlarsk <lars.kurth@citrix.com>
Thu, 27 Jun 2013 11:08:11 +0000 (12:08 +0100)
html-xenbits-xenproject-org/T.zip [deleted file]
skin-mediawiki.xenproject.org/mediawiki/mycss/base.css
skin-mediawiki.xenproject.org/mediawiki/mycss/menus1.css
skin-mediawiki.xenproject.org/mediawiki/skins/MonoBook.php

diff --git a/html-xenbits-xenproject-org/T.zip b/html-xenbits-xenproject-org/T.zip
deleted file mode 100644 (file)
index 8375789..0000000
Binary files a/html-xenbits-xenproject-org/T.zip and /dev/null differ
index 50ba8d284c61d3bbce7af1385388cbd9d78a7cc3..fe95ca4aa68b4122ab4e110777425b2a9d72b5ff 100644 (file)
@@ -1,10 +1,20 @@
 /* Copyright (C) YOOtheme GmbH, http://www.gnu.org/licenses/gpl.html GNU/GPL */
 
-@import url(../warp/css/base.css);
+
 
 
 /* New style-related Base Values
 ----------------------------------------------------------------------------------------------------*/
+body {
+font: normal 14px/20px Arial, Helvetica, sans-serif;
+color: #444;
+}
+
+/* Fonts look too big on the blog */
+h1 { font-size: 26px; line-height: 30px; }
+h2 { font-size: 20px; line-height: 22px; }
+h3 { font-size: 18px; line-height: 20px; }
+h4, h5, h6 { font-size: 16px; line-height: 17px; }
 
 body {
        font: normal 14px/20px Arial, Helvetica, sans-serif;
index 2f56a5c9f75c2e6ed553dcf6c50cf8e19737af30..a4d2feb186539f634278e0d63404275b6d7fbdab 100644 (file)
@@ -1,6 +1,6 @@
 /* Copyright (C) YOOtheme GmbH, http://www.gnu.org/licenses/gpl.html GNU/GPL */
 
-@import url(../warp/css/menus.css);
+
 
 
 /* Mega Drop-Down Menu
index 7ce7f3109c648cbb58bccd9efadef2046eedfd77..fe3f5723651309815d29f905aa74ecb771a37473 100644 (file)
@@ -1,25 +1,10 @@
 <?php
 /**
- * MonoBook nouveau.
+ * MonoBook nouveau
  *
  * Translated from gwicke's previous TAL template version to remove
  * dependency on PHPTAL.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
  * @todo document
  * @file
  * @ingroup Skins
@@ -35,28 +20,32 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinMonoBook extends SkinTemplate {
        /** Using monobook. */
-       var $skinname = 'monobook', $stylename = 'monobook',
-               $template = 'MonoBookTemplate', $useHeadElement = true;
+       function initPage( OutputPage $out ) {
+               parent::initPage( $out );
+               $this->skinname  = 'monobook';
+               $this->stylename = 'monobook';
+               $this->template  = 'MonoBookTemplate';
+
+       }
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
-               parent::setupSkinUserCss( $out );
 
-               $out->addModuleStyles( 'skins.monobook' );
+               parent::setupSkinUserCss( $out );
 
-               // Ugh. Can't do this properly because $wgHandheldStyle may be a URL
+               // Append to the default screen common & print styles...
+               $out->addStyle( 'monobook/main.css', 'screen' );
                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/rtl.css', 'screen', '', 'rtl' );
        }
 }
 
@@ -64,8 +53,8 @@ class SkinMonoBook extends SkinTemplate {
  * @todo document
  * @ingroup Skins
  */
-class MonoBookTemplate extends BaseTemplate {
-
+class MonoBookTemplate extends QuickTemplate {
+       var $skin;
        /**
         * Template filter callback for MonoBook skin.
         * Takes an associative array of data set from a SkinTemplate-based
@@ -75,12 +64,52 @@ class MonoBookTemplate extends BaseTemplate {
         * @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();
 
-               $this->html( 'headelement' );
-?>
-<link href="/mycss/layout.css" rel="stylesheet" type="text/css"/>
+?><!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') ?>"><link href="/mycss/layout.css" rel="stylesheet" type="text/css"/>
 
 <link href="/mycss/base.css" rel="stylesheet" type="text/css"/>
 <link href="/mycss/style1.css" rel="stylesheet" type="text/css"/>
@@ -99,7 +128,7 @@ class MonoBookTemplate extends BaseTemplate {
                                                        
                                <div class="module smalltopmenu  deepest">
 
-                       <ul class="menu menu-line"><li class="level1 item435 active current"><a class="level1 active current" href="/"><span>Home</span></a></li><li class="level1 item506"><a href="http://wiki.xenproject.org " class="item1 level1"><span>Wiki</span></a></li><li class="level1 item507"><a href="http://blog.xenproject.org" class="item2 level1"><span>Blog</span></a></li><li class="level1 item517"><a href="http://lists.xenproject.org" class="item3 level1"><span>Lists</span></a></li><li class="level1 item508"><a href="http://xenorg.uservoice.com" class="item4 level1"><span>User Voice</span></a></li><li class="level1 item509"><a href="/downloads.html" class="item5 level1"><span>Downloads</span></a></li><li class="level1 item510"><a href="/xen-planet.html" class="item6 level1"><span>Xen Planet</span></a></li></ul>                
+                       <ul class="menu menu-line"><li class="level1 item435 active current"><a class="level1 active current" href="http://xenproject.org"><span>Home</span></a></li><li class="level1 item506"><a href="http://wiki.xenproject.org " class="item1 level1"><span>Wiki</span></a></li><li class="level1 item507"><a href="http://blog.xenproject.org" class="item2 level1"><span>Blog</span></a></li><li class="level1 item517"><a href="http://lists.xenproject.org" class="item3 level1"><span>Lists</span></a></li><li class="level1 item508"><a href="http://xenorg.uservoice.com" class="item4 level1"><span>User Voice</span></a></li><li class="level1 item509"><a href="http://xenproject.org/downloads.html" class="item5 level1"><span>Downloads</span></a></li><li class="level1 item510"><a href="http://xenproject.org/xen-planet.html" class="item6 level1"><span>Xen Planet</span></a></li></ul>          
 </div>                         
                        </div>
                                                        
@@ -109,90 +138,130 @@ class MonoBookTemplate extends BaseTemplate {
 </div></div>
                                        </div>
        </div>
-<div id="globalWrapper">
-<div id="column-content"><div id="content" class="mw-body-primary">
-       <a id="top"></a>
-       <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-
-       <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']) { ?>
-               <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" class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a><?php $this->msg( 'comma-separator' ) ?><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 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>
        </div>
-</div></div>
-<div id="column-one"<?php $this->html('userlangattributes')  ?>>
-<?php $this->cactions(); ?>
        <div class="portlet" id="p-personal">
                <h5><?php $this->msg('personaltools') ?></h5>
                <div class="pBody">
-                       <ul<?php $this->html('userlangattributes') ?>>
-<?php          foreach($this->getPersonalTools() as $key => $item) { ?>
-                               <?php echo $this->makeListItem($key, $item); ?>
-
-<?php          } ?>
+                       <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>
                </div>
        </div>
        <div class="portlet" id="p-logo">
-<?php
-                       echo Html::element( 'a', array(
-                               'href' => $this->data['nav_urls']['mainpage']['href'],
-                               'style' => "background-image: url({$this->data['logopath']});" )
-                               + Linker::tooltipAndAccesskeyAttribs('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('p-logo') ?>></a>
        </div>
+       <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 <?php
-       $this->renderPortals( $this->data['sidebar'] );
+               $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 );
+                       }
+               }
 ?>
-</div><!-- end of the left (by default at least) column -->
-<div class="visualClear"></div>
+               </div><!-- end of the left (by default at least) column -->
+                       <div class="visualClear"></div>
+                       <div id="footer">
 <?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->getSkin()->makeFooterIcon( $icon ); ?>
-
-<?php }
-?>
-       </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(
+                       '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">
-<?php
-                       foreach( $validFooterLinks as $aLink ) { ?>
-               <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
+?>                     <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>
+<?php                  }
                        }
 ?>
-       </ul>
+                       </ul>
 <?php  }
-echo $footerEnd;
 ?>
-<div class="green-footer">
+               </div>
+        <div class="green-footer">
     <div class="mywrapper myclearfix">
        <p>&copy;2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved. <br>
     Linux Foundation is a registered trademark of The Linux Foundation. <br>
@@ -200,83 +269,42 @@ echo $footerEnd;
     </div> 
 </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
-               $this->printTrail();
-               echo Html::closeElement( 'body' );
-               echo Html::closeElement( 'html' );
-               wfRestoreWarnings();
+       wfRestoreWarnings();
        } // 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;
 ?>
        <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('wgScript') ?>" id="searchform">
+                       <form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
                                <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: ?>
+                               <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' ); ?> /><?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
-                               endif; ?>
+                               <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?>
 
-                       </form>
+                       </div></form>
                </div>
        </div>
 <?php
        }
 
-       /**
-        * Prints the cactions bar.
-        * Shared between MonoBook and Modern
-        */
-       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) {
-                                       echo '
-                               ' . $this->makeListItem( $key, $tab );
-                               } ?>
-
-                       </ul>
-               </div>
-       </div>
-<?php
-       }
        /*************************************************************************************************/
        function toolbox() {
 ?>
@@ -285,13 +313,51 @@ echo $footerEnd;
                <div class="pBody">
                        <ul>
 <?php
-               foreach ( $this->getToolbox() as $key => $tbitem ) { ?>
-                               <?php echo $this->makeListItem($key, $tbitem); ?>
-
+               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) {
+                                       ?><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>&nbsp;
+                                       <?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'])
+                               ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
+               }
+
+               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
+               }
+
                wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
-               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
 ?>
                        </ul>
                </div>
@@ -304,12 +370,12 @@ echo $footerEnd;
                if( $this->data['language_urls'] ) {
 ?>
        <div id="p-lang" class="portlet">
-               <h5<?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5>
+               <h5><?php $this->msg('otherlanguages') ?></h5>
                <div class="pBody">
                        <ul>
-<?php          foreach($this->data['language_urls'] as $key => $langlink) { ?>
-                               <?php echo $this->makeListItem($key, $langlink); ?>
-
+<?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          } ?>
                        </ul>
                </div>
@@ -319,26 +385,17 @@ echo $footerEnd;
        }
 
        /*************************************************************************************************/
-       /**
-        * @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" );
-               if ( $tooltip !== false ) {
-                       $portletAttribs['title'] = $tooltip;
-               }
-               echo '  ' . Html::openElement( 'div', $portletAttribs );
 ?>
-
-               <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5>
+       <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>
                <div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
                        <ul>
 <?php                  foreach($cont as $key => $val) { ?>
-                               <?php echo $this->makeListItem($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                  } ?>
                        </ul>
 <?php   } else {
@@ -350,6 +407,7 @@ echo $footerEnd;
        </div>
 <?php
        }
+
 } // end of class