* (bug 13234) Do not show grey category box for pages with only hidden categories

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

index e61f94a..4061da8 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -71,6 +71,8 @@ class MonoBookTemplate extends QuickTemplate {
                 <?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  } ?>
@@ -87,18 +89,16 @@ class MonoBookTemplate extends QuickTemplate {
                 <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
  <?php  }
                 if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-               <!-- Head Scripts -->
-<?php $this->html('headscripts') ?>
         </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 } ?>
+<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('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
         <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 class="firstHeading"><span class="mw-headline"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></span></h1>
+               <h1 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>
@@ -107,7 +107,7 @@ class MonoBookTemplate extends QuickTemplate {
                         <?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']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+                       <?php if($this->data['catlinks']) { ?><?php       $this->html('catlinks') ?><?php } ?>
                         <!-- end content -->
                         <div class="visualClear"></div>
                 </div>
@@ -169,8 +169,8 @@ class MonoBookTemplate extends QuickTemplate {
                                 <input id="searchInput" name="search" type="text"<?php echo $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') ?>" />&nbsp;
-                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>" />
+                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $skin->tooltipAndAccesskey( 'search-go' ); ?> />&nbsp;
+                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
                         </div></form>
                 </div>
         </div>