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 99bb6e8..81e9236 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -11,7 +11,7 @@
  */
 
 if( !defined( 'MEDIAWIKI' ) )
-       die();
+       die( -1 );
 
 /** */
 require_once('includes/SkinTemplate.php');
@@ -56,40 +56,46 @@ 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[*/ @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]-->
-               <!--[if gte IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
-               <!--[if IE]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
+               <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
+               <!--[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]-->
+               
+               <?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 echo $this->text('jsmimetype') ?>" src="<?php echo $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
 <?php  } ?>
-               <script type="<?php echo $this->text('jsmimetype') ?>" src="<?php echo $this->text('stylepath' ) ?>/common/wikibits.js"><!-- wikibits js --></script>
 <?php  if($this->data['pagecss'   ]) { ?>
-               <style type="text/css"><?php echo $this->html('pagecss'   ) ?></style>
+               <style type="text/css"><?php $this->html('pagecss'   ) ?></style>
 <?php  }
                if($this->data['usercss'   ]) { ?>
-               <style type="text/css"><?php echo $this->html('usercss'   ) ?></style>
+               <style type="text/css"><?php $this->html('usercss'   ) ?></style>
 <?php  }
                if($this->data['userjs'    ]) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php echo $this->text('userjs' ) ?>"></script>
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
 <?php  }
                if($this->data['userjsprev']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>"><?php echo $this->html('userjsprev') ?></script>
+               <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 } ?>
-<?php if($this->data['nsclass'        ]) { ?>class="<?php      $this->text('nsclass')         ?>"<?php } ?>>
+ class="<?php $this->text('nsclass') ?> <?php $this->text('dir') ?>">
        <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"><?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>
@@ -153,7 +159,7 @@ class MonoBookTemplate extends QuickTemplate {
        <?php } ?>
        <div id="p-search" class="portlet">
                <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
-               <div class="pBody">
+               <div id="searchBody" class="pBody">
                        <form action="<?php $this->text('searchaction') ?>" id="searchform"><div>
                                <input id="searchInput" name="search" type="text" <?php
                                        if($this->haveMsg('accesskey-search')) {
@@ -161,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>
@@ -173,27 +179,27 @@ class MonoBookTemplate extends QuickTemplate {
                if($this->data['notspecialpage']) { ?>
                                <li id="t-whatlinkshere"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href'])
-                               ?>"><?php echo $this->msg('whatlinkshere') ?></a></li>
+                               ?>"><?php $this->msg('whatlinkshere') ?></a></li>
 <?php
                        if( $this->data['nav_urls']['recentchangeslinked'] ) { ?>
                                <li id="t-recentchangeslinked"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href'])
-                               ?>"><?php echo $this->msg('recentchangeslinked') ?></a></li>
+                               ?>"><?php $this->msg('recentchangeslinked') ?></a></li>
 <?php          }
                }
                if(isset($this->data['nav_urls']['trackbacklink'])) { ?>
                        <li id="t-trackbacklink"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
-                               ?>"><?php echo $this->msg('trackbacklink') ?></a></li>
+                               ?>"><?php $this->msg('trackbacklink') ?></a></li>
 <?php  }
                if($this->data['feeds']) { ?>
                        <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
                                        ?><span id="feed-<?php echo htmlspecialchars($key) ?>"><a href="<?php
                                        echo htmlspecialchars($feed['href']) ?>"><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
                                        <?php } ?></li><?php
-               } 
+               }
 
-               foreach( array('contributions', 'userfiles', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
+               foreach( array('contributions', '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'])
@@ -203,14 +209,14 @@ class MonoBookTemplate extends QuickTemplate {
 
                if(!empty($this->data['nav_urls']['print']['href'])) { ?>
                                <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href'])
-                               ?>"><?php echo $this->msg('printableversion') ?></a></li><?php
+                               ?>"><?php $this->msg('printableversion') ?></a></li><?php
                }
 
                if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
                                <li id="t-permalink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['permalink']['href'])
-                               ?>"><?php echo $this->msg('permalink') ?></a></li><?php
+                               ?>"><?php $this->msg('permalink') ?></a></li><?php
                } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
-                               <li id="t-ispermalink"><?php echo $this->msg('permalink') ?></li><?php
+                               <li id="t-ispermalink"><?php $this->msg('permalink') ?></li><?php
                }
 
                wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
@@ -221,7 +227,7 @@ class MonoBookTemplate extends QuickTemplate {
 <?php
                if( $this->data['language_urls'] ) { ?>
        <div id="p-lang" class="portlet">
-               <h5><?php echo $this->msg('otherlanguages') ?></h5>
+               <h5><?php $this->msg('otherlanguages') ?></h5>
                <div class="pBody">
                        <ul>
 <?php          foreach($this->data['language_urls'] as $langlink) { ?>
@@ -253,15 +259,16 @@ class MonoBookTemplate extends QuickTemplate {
                );
                foreach( $footerlinks as $aLink ) {
                        if( $this->data[$aLink] ) {
-?>                             <li id="<?php echo$aLink?>"><?php echo $this->html($aLink) ?></li>
+?>                             <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
 <?php          }
                }
 ?>
                        </ul>
                </div>
-       <script type="text/javascript"> if (window.runOnloadHook) runOnloadHook();</script>
+               
+       <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
 </div>
-<?php echo $this->html('reporttime') ?>
+<?php $this->html('reporttime') ?>
 
 </body></html>
 <?php