* (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 1ebe71d..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,11 +89,9 @@ 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">
@@ -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>
@@ -221,11 +221,6 @@ class MonoBookTemplate extends QuickTemplate {
                 } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
                                 <li id="t-ispermalink"<?php echo $skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php
                 }
-               
-               if(!empty($this->data['nav_urls']['randomincategory']['href'])) { ?>
-                               <li id="t-random"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['randomincategory']['href'])
-                               ?>"<?php echo $skin->tooltipAndAccesskey('t-random') ?>><?php $this->msg('randomincategory-toolbox') ?></a></li><?php
-               }
  
                 wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
  ?>