* (bug 2773) Print style sheet no longer overrides RTL text direction

[lhc/web/wiklou.git] / skins / MonoBook.php

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index b07660c..60615ed 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -56,7 +56,7 @@ 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"; /*]]>*/</style>
+    <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]-->
@@ -85,6 +85,7 @@ class MonoBookTemplate extends QuickTemplate {
            <div id="contentSub"><?php $this->html('subtitle') ?></div>
            <?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 } ?>
@@ -110,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
@@ -134,11 +135,7 @@ class MonoBookTemplate extends QuickTemplate {
                                echo '<li id="' . htmlspecialchars($val['id']) . '"';
                                if ( $val['active'] ) echo ' class="active"';
                                echo '>';
-                               if ( $val['active'] ) echo '<strong>';
-                               if ( $val['dolink'] ) echo '<a href="' . htmlspecialchars($val['href']) . '">';
-                               echo htmlspecialchars($val['text']); 
-                               if ( $val['active'] ) echo '</strong>';
-                               if ( $val['dolink'] ) echo '</a>';
+                               echo '<a href="' . htmlspecialchars($val['href']) . '">' . htmlspecialchars($val['text']) . '</a>'; 
                                echo '</li>';
                        } ?>
            </ul>