Drop some useless parameters to silly methods on the pretty much broken MediaWiki...

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

index d0148a7..389cb14 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -71,27 +71,27 @@ 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'  ]) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site 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['pagecss']) { ?>
+               <style type="text/css"><?php $this->html('pagecss') ?></style>
  <?php  }
-               if($this->data['usercss'   ]) { ?>
-               <style type="text/css"><?php $this->html('usercss'   ) ?></style>
+               if($this->data['usercss']) { ?>
+               <style type="text/css"><?php $this->html('usercss') ?></style>
  <?php  }
-               if($this->data['userjs'    ]) { ?>
+               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 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']) { $this->html('catlinks'); } ?>
                         <!-- end content -->
                         <div class="visualClear"></div>
                 </div>
@@ -149,7 +149,7 @@ class MonoBookTemplate extends QuickTemplate {
         </div>
         <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
         <?php foreach ($this->data['sidebar'] as $bar => $cont) { ?>
-       <div class='portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>>
+       <div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>>
                 <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
                 <div class='pBody'>
                         <ul>
@@ -174,6 +174,11 @@ class MonoBookTemplate extends QuickTemplate {
                         </div></form>
                 </div>
         </div>
+    <?php
+      if(isset($GLOBALS['wgSpecialPages']['Collection'])) {
+         Collection::printPortlet();
+      }
+    ?>
         <div class="portlet" id="p-tb">
                 <h5><?php $this->msg('toolbox') ?></h5>
                 <div class="pBody">