* (bug 2773) Print style sheet no longer overrides RTL text direction
[lhc/web/wiklou.git] / skins / MonoBook.php
index 566c560..60615ed 100644 (file)
@@ -10,6 +10,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+       die();
+
 /** */
 require_once('includes/SkinTemplate.php');
 
@@ -28,7 +31,12 @@ class SkinMonoBook extends SkinTemplate {
                $this->template  = 'MonoBookTemplate';
        }
 }
-       
+
+/**
+ * @todo document
+ * @package MediaWiki
+ * @subpackage Skins
+ */
 class MonoBookTemplate extends QuickTemplate {
        /**
         * Template filter callback for MonoBook skin.
@@ -39,24 +47,32 @@ class MonoBookTemplate extends QuickTemplate {
         * @access private
         */
        function execute() {
+               // Suppress warnings to prevent notices about missing indexes in $this->data
+               wfSuppressWarnings();
+
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
   <head>
     <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"; /*]]>*/</style>
-    <link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
-    <!--[if IE]><style type="text/css" media="all">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IEFixes.css";</style>
-    <script type="text/javascript" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
+    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?1"; /*]]>*/</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>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <?php if($this->data['jsvarurl'  ]) { ?><script type="text/javascript" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
-    <script type="text/javascript" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>
+    <?php if($this->data['jsvarurl'  ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
+    <script type="<?php $this->text('jsmimetype') ?>" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>
+    <?php if($this->data['pagecss'   ]) { ?><style type="text/css"><?php              $this->html('pagecss'   ) ?></style><?php    } ?>
     <?php if($this->data['usercss'   ]) { ?><style type="text/css"><?php              $this->html('usercss'   ) ?></style><?php    } ?>
-    <?php if($this->data['userjs'    ]) { ?><script type="text/javascript" src="<?php $this->text('userjs'    ) ?>"></script><?php } ?>
-    <?php if($this->data['userjsprev']) { ?><script type="text/javascript"><?php      $this->html('userjsprev') ?></script><?php   } ?>
+    <?php if($this->data['userjs'    ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs'    ) ?>"></script><?php } ?>
+    <?php if($this->data['userjsprev']) { ?><script type="<?php $this->text('jsmimetype') ?>"><?php      $this->html('userjsprev') ?></script><?php   } ?>
+    <?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 } ?>
         <?php if($this->data['nsclass'        ]) { ?>class="<?php      $this->text('nsclass')         ?>"<?php } ?>>
     <div id="globalWrapper">
       <div id="column-content">
@@ -67,8 +83,9 @@ class MonoBookTemplate extends QuickTemplate {
          <div id="bodyContent">
            <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
            <div id="contentSub"><?php $this->html('subtitle') ?></div>
-           <?php if($this->data['undelete']) { ?><div id="contentSub"><?php     $this->html('undelete') ?></div><?php } ?>
+           <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
            <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
+           <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>
            <!-- start content -->
            <?php $this->html('bodytext') ?>
            <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
@@ -79,13 +96,13 @@ class MonoBookTemplate extends QuickTemplate {
       </div>
       <div id="column-one">
        <div id="p-cactions" class="portlet">
-         <h5>Views</h5>
+         <h5><?php $this->msg('views') ?></h5>
          <ul>
-           <?php foreach($this->data['content_actions'] as $key => $action) {
+           <?php foreach($this->data['content_actions'] as $key => $tab) {
               ?><li id="ca-<?php echo htmlspecialchars($key) ?>"
-              <?php if($action['class']) { ?>class="<?php echo htmlspecialchars($action['class']) ?>"<?php } ?>
-              ><a href="<?php echo htmlspecialchars($action['href']) ?>"><?php
-              echo htmlspecialchars($action['text']) ?></a></li><?php
+              <?php if($tab['class']) { ?>class="<?php echo htmlspecialchars($tab['class']) ?>"<?php } ?>
+              ><a href="<?php echo htmlspecialchars($tab['href']) ?>"><?php
+              echo htmlspecialchars($tab['text']) ?></a></li><?php
             } ?>
          </ul>
        </div>
@@ -94,7 +111,7 @@ class MonoBookTemplate extends QuickTemplate {
          <div class="pBody">
            <ul>
            <?php foreach($this->data['personal_urls'] as $key => $item) {
-              ?><li id="pt-<?php echo htmlspecialchars($key) ?>"><a href="<?php
+              ?><li id="pt-<?php echo htmlspecialchars($key) ?>"<?php if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
               echo htmlspecialchars($item['href']) ?>"<?php
               if(!empty($item['class'])) { ?> class="<?php
               echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
@@ -108,30 +125,38 @@ class MonoBookTemplate extends QuickTemplate {
            href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"
            title="<?php $this->msg('mainpage') ?>"></a>
        </div>
-       <div class="portlet" id="p-nav">
-         <h5><?php $this->msg('navigation') ?></h5>
-         <div class="pBody">
+       <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 htmlspecialchars($bar) ?>'>
+         <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
+         <div class='pBody'>
            <ul>
-             <?php foreach($this->data['navigation_urls'] as $navlink) { ?>
-             <li id="<?php echo htmlspecialchars($navlink['id'])
-               ?>"><a href="<?php echo htmlspecialchars($navlink['href']) ?>"><?php 
-               echo htmlspecialchars($navlink['text']) ?></a></li><?php } ?>
+           <?php foreach($cont as $key => $val) { 
+                               echo '<li id="' . htmlspecialchars($val['id']) . '"';
+                               if ( $val['active'] ) echo ' class="active"';
+                               echo '>';
+                               echo '<a href="' . htmlspecialchars($val['href']) . '">' . htmlspecialchars($val['text']) . '</a>'; 
+                               echo '</li>';
+                       } ?>
            </ul>
          </div>
        </div>
+       <?php } ?>
        <div id="p-search" class="portlet">
-         <h5><?php $this->msg('search') ?></h5>
+         <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
          <div class="pBody">
-           <form name="searchform" action="<?php $this->text('searchaction') ?>" id="searchform">
+           <form action="<?php $this->text('searchaction') ?>" id="searchform"><div>
              <input id="searchInput" name="search" type="text"
                <?php if($this->haveMsg('accesskey-search')) {
-                 ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php } ?> />
-             <input type='submit' name="go" class="searchButton"
+                 ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php }
+               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') ?>" />
-           </form>
+           </div></form>
          </div>
        </div>
        <div class="portlet" id="p-tb">
@@ -140,18 +165,35 @@ class MonoBookTemplate extends QuickTemplate {
            <ul>
                  <?php if($this->data['notspecialpage']) { foreach( array( 'whatlinkshere', 'recentchangeslinked' ) as $special ) { ?>
                  <li id="t-<?php echo $special?>"><a href="<?php
-                   echo htmlspecialchars($this->data['nav_urls'][$special]['href']) 
+                   echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
                    ?>"><?php echo $this->msg($special) ?></a></li>
                  <?php } } ?>
+              <?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 } ?>
              <?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'])?>&nbsp;</span>
+               echo htmlspecialchars($feed['href']) ?>"><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
                <?php } ?></li><?php } ?>
              <?php foreach( array('contributions', 'emailuser', 'upload', 'specialpages') as $special ) { ?>
              <?php if($this->data['nav_urls'][$special]) {?><li id="t-<?php echo $special ?>"><a href="<?php
                echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
                ?>"><?php $this->msg($special) ?></a></li><?php } ?>
              <?php } ?>
+             <?php 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 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 } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
+                   <li id="t-ispermalink"><?php echo $this->msg('permalink') ?></li>
+                 <?php } ?>
            </ul>
          </div>
        </div>
@@ -160,9 +202,9 @@ class MonoBookTemplate extends QuickTemplate {
          <div class="pBody">
            <ul>
              <?php foreach($this->data['language_urls'] as $langlink) { ?>
-             <li>
+             <li class="<?php echo htmlspecialchars($langlink['class'])?>">
              <a href="<?php echo htmlspecialchars($langlink['href'])
-               ?>"><?php echo htmlspecialchars($langlink['text']) ?></a>
+               ?>"><?php echo $langlink['text'] ?></a>
              </li>
              <?php } ?>
            </ul>
@@ -177,10 +219,12 @@ class MonoBookTemplate extends QuickTemplate {
        <ul id="f-list">
          <?php if($this->data['lastmod'   ]) { ?><li id="f-lastmod"><?php    $this->html('lastmod')    ?></li><?php } ?>
          <?php if($this->data['viewcount' ]) { ?><li id="f-viewcount"><?php  $this->html('viewcount')  ?></li><?php } ?>
+         <?php if($this->data['numberofwatchingusers' ]) { ?><li id="f-numberofwatchingusers"><?php  $this->html('numberofwatchingusers') ?></li><?php } ?>
          <?php if($this->data['credits'   ]) { ?><li id="f-credits"><?php    $this->html('credits')    ?></li><?php } ?>
          <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
          <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
          <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
+         <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
        </ul>
       </div>
     </div>
@@ -188,7 +232,7 @@ class MonoBookTemplate extends QuickTemplate {
   </body>
 </html>
 <?php
+       wfRestoreWarnings();
        }
 }
-
-?>
\ No newline at end of file
+?>