Updating the list of backlinks to namespaces in the skin Standard with the "new"...

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

index 72b6006..81e9236 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -55,9 +55,8 @@ class MonoBookTemplate extends QuickTemplate {
         <head>
                 <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
                 <?php $this->html('headlinks') ?>
-               <?php $this->html('headscripts') ?>
                 <title><?php $this->text('pagetitle') ?></title>
-               <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?5"; /*]]>*/</style>
+               <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?9"; /*]]>*/</style>
                 <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
                 <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
                 <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
@@ -65,7 +64,10 @@ class MonoBookTemplate extends QuickTemplate {
                 <!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?1";</style><![endif]-->
                 <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
                 <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js"><!-- wikibits js --></script>
+               
+               <?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
+                
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?1"><!-- wikibits js --></script>
  <?php  if($this->data['jsvarurl'  ]) { ?>
                 <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
  <?php  } ?>
@@ -82,6 +84,8 @@ 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 } ?>
@@ -91,7 +95,7 @@ class MonoBookTemplate extends QuickTemplate {
         <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"><?php $this->text('title') ?></h1>
+               <h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->text('title'):$this->html('title') ?></h1>
                 <div id="bodyContent">
                         <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
                         <div id="contentSub"><?php $this->html('subtitle') ?></div>
@@ -163,7 +167,7 @@ class MonoBookTemplate extends QuickTemplate {
                                         if( isset( $this->data['search'] ) ) {
                                                 ?> value="<?php $this->text('search') ?>"<?php } ?> />
                                 <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('go') ?>" />&nbsp;
-                               <input type='submit' name="fulltext" class="searchButton" value="<?php $this->msg('search') ?>" />
+                               <input type='submit' name="fulltext" class="searchButton" value="<?php $this->msg('searchbutton') ?>" />
                         </div></form>
                 </div>
         </div>
@@ -261,7 +265,8 @@ class MonoBookTemplate extends QuickTemplate {
  ?>
                         </ul>
                 </div>
-       <script type="text/javascript"> if (window.runOnloadHook) runOnloadHook();</script>
+               
+       <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
  </div>
  <?php $this->html('reporttime') ?>