* Move MonoBook printable link from tab to sidebar

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 621fe1c..c75d9ff 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -404,6 +404,8 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2577) Allow sysops to enter non-standard block times
 * Fixed a bug where Special:Contributions wouldn't remember the 'invert'
   status between next/previous buttons.
+* Move MonoBook printable link from tab to sidebar
+
 
 === Caveats ===
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9ee175e..4672018 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -705,15 +705,6 @@ class SkinTemplate extends Skin {
                                $vcount ++;
                        }
                }
-               
-               // A print stylesheet is attached to all pages, but nobody ever
-               // figures that out. :)  Add a link...
-               if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
-                       $content_actions['print'] = array(
-                               'class' => false,
-                               'text' => wfMsg( 'print' ),
-                               'href' => $wgRequest->appendQuery( 'printable=yes' ) );
-               }
 
                wfProfileOut( $fname );
                return $content_actions;
@@ -758,6 +749,15 @@ class SkinTemplate extends Skin {
                }
                $nav_urls['specialpages'] = array('href' => $this->makeSpecialUrl('Specialpages'));
 
+               
+               // A print stylesheet is attached to all pages, but nobody ever
+               // figures that out. :)  Add a link...
+               if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
+                       $nav_urls['print'] = array(
+                               'text' => wfMsg( 'printableversion' ),
+                               'href' => $wgRequest->appendQuery( 'printable=yes' ) );
+               }
+               
                if( $this->mTitle->getNamespace() != NS_SPECIAL) {
                        $nav_urls['whatlinkshere'] = array(
                                'href' => $this->makeSpecialUrl("Whatlinkshere/$this->thispage")

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 66c1c8e..5d94cff 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -170,6 +170,11 @@ class MonoBookTemplate extends QuickTemplate {
                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 } ?>
            </ul>
          </div>
        </div>