follow up r53582: remove duped line :/

[lhc/web/wiklou.git] / skins / MonoBook.php
diff --git a/skins/MonoBook.php b/skins/MonoBook.php

index ad859a0..c12bea6 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -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';
  
         function setupSkinUserCss( OutputPage $out ) {
                 global $wgHandheldStyle;
@@ -46,6 +41,29 @@ class SkinMonoBook extends SkinTemplate {
                 $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
  
                 $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 );
         }
  }
  
@@ -70,9 +88,8 @@ class MonoBookTemplate extends QuickTemplate {
  
                 // Suppress warnings to prevent notices about missing indexes in $this->data
                 wfSuppressWarnings();
-
-               $path = htmlspecialchars( $wgStylePath );
                 # 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]-->
@@ -87,7 +104,7 @@ HTML
         <div id="globalWrapper">
                 <div id="column-content">
         <div id="content">
-               <a name="top" id="top"></a>
+               <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">
@@ -231,7 +248,7 @@ HTML
                         <form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
                                 <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'] ) ) {
+                                       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) { ?>&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 { ?>
@@ -263,7 +280,7 @@ HTML
                                 ?>"<?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>