* (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 8582c61..4061da8 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -56,12 +56,11 @@ class MonoBookTemplate extends QuickTemplate {
                 <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>
-               <style type="text/css" media="screen,projection">/*<![CDATA[*/
+               <style type="text/css" media="screen, projection">/*<![CDATA[*/
                         @import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
                         @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
                 /*]]>*/</style>
                 <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
-               <link rel="stylesheet" type="text/css" media="handheld" href="<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/handheld.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
                 <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
                 <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
                 <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
@@ -72,11 +71,9 @@ 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>
-<?php  if($this->data['jsvarurl'  ]) { ?>
-
                 <!-- 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'   ]) { ?>
@@ -93,8 +90,8 @@ class MonoBookTemplate extends QuickTemplate {
  <?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 } ?>
+<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">
@@ -110,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>
@@ -172,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>
@@ -205,7 +202,7 @@ class MonoBookTemplate extends QuickTemplate {
                                         <?php } ?></li><?php
                 }
  
-               foreach( array('contributions', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
+               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'])