Merge "Increase maximum IPv6 range block size to /19"
[lhc/web/wiklou.git] / skins / MonoBook.php
index 2711a1a..8282fb3 100644 (file)
@@ -1,10 +1,25 @@
 <?php
 /**
- * MonoBook nouveau
+ * MonoBook nouveau.
  *
  * Translated from gwicke's previous TAL template version to remove
  * dependency on PHPTAL.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @todo document
  * @file
  * @ingroup Skins
@@ -23,26 +38,24 @@ class SkinMonoBook extends SkinTemplate {
        var $skinname = 'monobook', $stylename = 'monobook',
                $template = 'MonoBookTemplate', $useHeadElement = true;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
                parent::setupSkinUserCss( $out );
 
                $out->addModuleStyles( 'skins.monobook' );
-               
+
                // Ugh. Can't do this properly because $wgHandheldStyle may be a URL
                if( $wgHandheldStyle ) {
                        // Currently in testing... try 'chick/main.css'
                        $out->addStyle( $wgHandheldStyle, 'handheld' );
                }
-               
-               // TODO: Migrate all of these
-               //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
-               //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' );
-               //$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
-               //$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
 
-               // TODO: migrate
-               //$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
+               // TODO: Migrate all of these
+               $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
+               $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
 
        }
 }
@@ -52,7 +65,7 @@ class SkinMonoBook extends SkinTemplate {
  * @ingroup Skins
  */
 class MonoBookTemplate extends BaseTemplate {
-       var $skin;
+
        /**
         * Template filter callback for MonoBook skin.
         * Takes an associative array of data set from a SkinTemplate-based
@@ -62,22 +75,17 @@ class MonoBookTemplate extends BaseTemplate {
         * @access private
         */
        function execute() {
-               global $wgRequest;
-
-               $this->skin = $skin = $this->data['skin'];
-               $action = $wgRequest->getText( 'action' );
-
                // Suppress warnings to prevent notices about missing indexes in $this->data
                wfSuppressWarnings();
 
                $this->html( 'headelement' );
 ?><div id="globalWrapper">
-<div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>>
+<div id="column-content"><div id="content">
        <a id="top"></a>
        <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
 
-       <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
-       <div id="bodyContent">
+       <h1 id="firstHeading" class="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1>
+       <div id="bodyContent" class="mw-body">
                <div id="siteSub"><?php $this->msg('tagline') ?></div>
                <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
 <?php if($this->data['undelete']) { ?>
@@ -85,7 +93,7 @@ class MonoBookTemplate extends BaseTemplate {
 <?php } ?><?php if($this->data['newtalk'] ) { ?>
                <div class="usermessage"><?php $this->html('newtalk')  ?></div>
 <?php } ?><?php if($this->data['showjumplinks']) { ?>
-               <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>
+               <div id="jump-to-nav" class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div>
 <?php } ?>
                <!-- start content -->
 <?php $this->html('bodytext') ?>
@@ -96,7 +104,7 @@ class MonoBookTemplate extends BaseTemplate {
        </div>
 </div></div>
 <div id="column-one"<?php $this->html('userlangattributes')  ?>>
-<?php $this->cactions( $skin ); ?>
+<?php $this->cactions(); ?>
        <div class="portlet" id="p-personal">
                <h5><?php $this->msg('personaltools') ?></h5>
                <div class="pBody">
@@ -109,56 +117,52 @@ class MonoBookTemplate extends BaseTemplate {
                </div>
        </div>
        <div class="portlet" id="p-logo">
-               <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
-                       ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
-                       echo $skin->tooltipAndAccesskey('p-logo') ?>></a>
+<?php
+                       echo Html::element( 'a', array(
+                               'href' => $this->data['nav_urls']['mainpage']['href'],
+                               'style' => "background-image: url({$this->data['logopath']});" )
+                               + Linker::tooltipAndAccesskeyAttribs('p-logo') ); ?>
+
        </div>
-       <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 <?php
-               $sidebar = $this->data['sidebar'];
-               if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
-               if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
-               if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
-               foreach ($sidebar as $boxName => $cont) {
-                       if ( $boxName == 'SEARCH' ) {
-                               $this->searchBox();
-                       } elseif ( $boxName == 'TOOLBOX' ) {
-                               $this->toolbox();
-                       } elseif ( $boxName == 'LANGUAGES' ) {
-                               $this->languageBox();
-                       } else {
-                               $this->customBox( $boxName, $cont );
-                       }
-               }
+       $this->renderPortals( $this->data['sidebar'] );
 ?>
 </div><!-- end of the left (by default at least) column -->
 <div class="visualClear"></div>
+<?php
+       $validFooterIcons = $this->getFooterIcons( "icononly" );
+       $validFooterLinks = $this->getFooterLinks( "flat" ); // Additional footer links
+
+       if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?>
 <div id="footer"<?php $this->html('userlangattributes') ?>>
-<?php foreach ( $this->getFooterIcons("icononly") as $blockName => $footerIcons ) { ?>
+<?php
+               $footerEnd = '</div>';
+       } else {
+               $footerEnd = '';
+       }
+       foreach ( $validFooterIcons as $blockName => $footerIcons ) { ?>
        <div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
 <?php foreach ( $footerIcons as $icon ) { ?>
-               <?php echo $this->skin->makeFooterIcon( $icon ); ?>
+               <?php echo $this->getSkin()->makeFooterIcon( $icon ); ?>
 
 <?php }
 ?>
        </div>
 <?php }
 
-               // Generate additional footer links
-               $validFooterLinks = $this->getFooterLinks("flat");
                if ( count( $validFooterLinks ) > 0 ) {
 ?>     <ul id="f-list">
 <?php
                        foreach( $validFooterLinks as $aLink ) { ?>
                <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
-
 <?php
                        }
 ?>
        </ul>
 <?php  }
+echo $footerEnd;
 ?>
-</div>
+
 </div>
 <?php
                $this->printTrail();
@@ -168,6 +172,31 @@ class MonoBookTemplate extends BaseTemplate {
        } // end of execute() method
 
        /*************************************************************************************************/
+
+       /**
+        * @param $sidebar array
+        */
+       protected function renderPortals( $sidebar ) {
+               if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
+               if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
+               if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
+
+               foreach( $sidebar as $boxName => $content ) {
+                       if ( $content === false )
+                               continue;
+
+                       if ( $boxName == 'SEARCH' ) {
+                               $this->searchBox();
+                       } elseif ( $boxName == 'TOOLBOX' ) {
+                               $this->toolbox();
+                       } elseif ( $boxName == 'LANGUAGES' ) {
+                               $this->languageBox();
+                       } else {
+                               $this->customBox( $boxName, $content );
+                       }
+               }
+       }
+
        function searchBox() {
                global $wgUseTwoButtonsSearchForm;
 ?>
@@ -196,7 +225,7 @@ class MonoBookTemplate extends BaseTemplate {
         * Prints the cactions bar.
         * Shared between MonoBook and Modern
         */
-       function cactions( Skin $skin ) {
+       function cactions() {
 ?>
        <div id="p-cactions" class="portlet">
                <h5><?php $this->msg('views') ?></h5>
@@ -204,23 +233,7 @@ class MonoBookTemplate extends BaseTemplate {
                        <ul><?php
                                foreach($this->data['content_actions'] as $key => $tab) {
                                        echo '
-                                <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
-                                       if( $tab['class'] ) {
-                                               echo ' class="'.htmlspecialchars($tab['class']).'"';
-                                       }
-                                       echo '>';
-                                       $linkAttribs = array( 'href' => $tab['href'] );
-                                       
-                                       if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) {
-                                               $title = $skin->titleAttrib( "ca-$key" );
-                                               if ( $title !== false ) {
-                                                       $linkAttribs['title'] = $title;
-                                               }
-                                       } else {
-                                               $linkAttribs += $skin->tooltipAndAccesskeyAttribs( "ca-$key" );
-                                       }
-                                       echo Html::element( 'a', $linkAttribs, $tab['text'] );
-                                       echo '</li>';
+                               ' . $this->makeListItem( $key, $tab );
                                } ?>
 
                        </ul>
@@ -242,7 +255,7 @@ class MonoBookTemplate extends BaseTemplate {
 <?php
                }
                wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
-               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
+               wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
 ?>
                        </ul>
                </div>
@@ -270,10 +283,20 @@ class MonoBookTemplate extends BaseTemplate {
        }
 
        /*************************************************************************************************/
+       /**
+        * @param $bar string
+        * @param $cont array|string
+        */
        function customBox( $bar, $cont ) {
+               $portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) );
+               $tooltip = Linker::titleAttrib( "p-$bar" );
+               if ( $tooltip !== false ) {
+                       $portletAttribs['title'] = $tooltip;
+               }
+               echo '  ' . Html::openElement( 'div', $portletAttribs );
 ?>
-       <div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
-               <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
+
+               <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5>
                <div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
                        <ul>