diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /skins/Vector.php | |
parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) |
Update to MediaWiki 1.19.0
Diffstat (limited to 'skins/Vector.php')
-rw-r--r-- | skins/Vector.php | 76 |
1 files changed, 33 insertions, 43 deletions
diff --git a/skins/Vector.php b/skins/Vector.php index 97161611..4b6433d6 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -26,14 +26,14 @@ class SkinVector extends SkinTemplate { * @param $out OutputPage object to initialize */ public function initPage( OutputPage $out ) { - global $wgLocalStylePath, $wgRequest; + global $wgLocalStylePath; parent::initPage( $out ); // Append CSS which includes IE only behavior fixes for hover support - // this is better than including this in a CSS fille since it doesn't // wait for the CSS file to load before fetching the HTC file. - $min = $wgRequest->getFuzzyBool( 'debug' ) ? '' : '.min'; + $min = $this->getRequest()->getFuzzyBool( 'debug' ) ? '' : '.min'; $out->addHeadItem( 'csshover', '<!--[if lt IE 7]><style type="text/css">body{behavior:url("' . htmlspecialchars( $wgLocalStylePath ) . @@ -60,29 +60,19 @@ class SkinVector extends SkinTemplate { */ class VectorTemplate extends BaseTemplate { - /* Members */ - - /** - * @var Skin Cached skin object - */ - var $skin; - /* Functions */ /** * Outputs the entire contents of the (X)HTML page */ public function execute() { - global $wgLang, $wgVectorUseIconWatch; - - $this->skin = $this->data['skin']; + global $wgVectorUseIconWatch; // Build additional attributes for navigation urls - //$nav = $this->skin->buildNavigationUrls(); $nav = $this->data['content_navigation']; if ( $wgVectorUseIconWatch ) { - $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch'; + $mode = $this->getSkin()->getTitle()->userIsWatching() ? 'unwatch' : 'watch'; if ( isset( $nav['actions'][$mode] ) ) { $nav['views'][$mode] = $nav['actions'][$mode]; $nav['views'][$mode]['class'] = rtrim( 'icon ' . $nav['views'][$mode]['class'], ' ' ); @@ -121,7 +111,7 @@ class VectorTemplate extends BaseTemplate { $this->data['variant_urls'] = $nav['variants']; // Reverse horizontally rendered navigation elements - if ( $wgLang->isRTL() ) { + if ( $this->data['rtl'] ) { $this->data['view_urls'] = array_reverse( $this->data['view_urls'] ); $this->data['namespace_urls'] = @@ -135,7 +125,7 @@ class VectorTemplate extends BaseTemplate { <div id="mw-page-base" class="noprint"></div> <div id="mw-head-base" class="noprint"></div> <!-- content --> - <div id="content"> + <div id="content" class="mw-body"> <a id="top"></a> <div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div> <?php if ( $this->data['sitenotice'] ): ?> @@ -144,7 +134,9 @@ class VectorTemplate extends BaseTemplate { <!-- /sitenotice --> <?php endif; ?> <!-- firstHeading --> - <h1 id="firstHeading" class="firstHeading"><?php $this->html( 'title' ) ?></h1> + <h1 id="firstHeading" class="firstHeading"> + <span dir="auto"><?php $this->html( 'title' ) ?></span> + </h1> <!-- /firstHeading --> <!-- bodyContent --> <div id="bodyContent"> @@ -168,7 +160,7 @@ class VectorTemplate extends BaseTemplate { <?php endif; ?> <?php if ( $this->data['showjumplinks'] ): ?> <!-- jumpto --> - <div id="jump-to-nav"> + <div id="jump-to-nav" class="mw-jump"> <?php $this->msg( 'jumpto' ) ?> <a href="#mw-head"><?php $this->msg( 'jumptonavigation' ) ?></a>, <a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a> </div> @@ -236,7 +228,7 @@ class VectorTemplate extends BaseTemplate { <?php foreach ( $footericons as $blockName => $footerIcons ): ?> <li id="footer-<?php echo htmlspecialchars( $blockName ); ?>ico"> <?php foreach ( $footerIcons as $icon ): ?> - <?php echo $this->skin->makeFooterIcon( $icon ); ?> + <?php echo $this->getSkin()->makeFooterIcon( $icon ); ?> <?php endforeach; ?> </li> @@ -246,9 +238,6 @@ class VectorTemplate extends BaseTemplate { <div style="clear:both"></div> </div> <!-- /footer --> - <!-- fixalpha --> - <script type="<?php $this->text( 'jsmimetype' ) ?>"> if ( window.isMSIE55 ) fixalpha(); </script> - <!-- /fixalpha --> <?php $this->printTrail(); ?> </body> @@ -298,7 +287,7 @@ class VectorTemplate extends BaseTemplate { } private function renderPortal( $name, $content, $msg = null, $hook = null ) { - if ( !isset( $msg ) ) { + if ( $msg === null ) { $msg = $name; } ?> @@ -314,7 +303,7 @@ class VectorTemplate extends BaseTemplate { <?php endforeach; - if ( isset( $hook ) ) { + if ( $hook !== null ) { wfRunHooks( $hook, array( &$this, true ) ); } ?> @@ -332,16 +321,18 @@ class VectorTemplate extends BaseTemplate { /** * Render one or more navigations elements by name, automatically reveresed * when UI is in RTL mode + * + * @param $elements array */ private function renderNavigation( $elements ) { - global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang; + global $wgVectorUseSimpleSearch; // If only one element was given, wrap it in an array, allowing more // flexible arguments if ( !is_array( $elements ) ) { $elements = array( $elements ); // If there's a series of elements, reverse them when in RTL mode - } elseif ( $wgLang->isRTL() ) { + } elseif ( $this->data['rtl'] ) { $elements = array_reverse( $elements ); } // Render elements @@ -363,15 +354,13 @@ class VectorTemplate extends BaseTemplate { case 'VARIANTS': ?> <div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> - <?php if ( $wgVectorShowVariantName ): ?> - <h4> - <?php foreach ( $this->data['variant_urls'] as $link ): ?> - <?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?> - <?php echo htmlspecialchars( $link['text'] ) ?> - <?php endif; ?> - <?php endforeach; ?> - </h4> - <?php endif; ?> + <h4> + <?php foreach ( $this->data['variant_urls'] as $link ): ?> + <?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?> + <?php echo htmlspecialchars( $link['text'] ) ?> + <?php endif; ?> + <?php endforeach; ?> + </h4> <h5><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h5> <div class="menu"> <ul<?php $this->html( 'userlangattributes' ) ?>> @@ -432,22 +421,23 @@ class VectorTemplate extends BaseTemplate { <div id="p-search"> <h5<?php $this->html( 'userlangattributes' ) ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5> <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform"> - <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/> - <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?> + <?php if ( $wgVectorUseSimpleSearch && $this->getSkin()->getUser()->getOption( 'vector-simplesearch' ) ): ?> <div id="simpleSearch"> <?php if ( $this->data['rtl'] ): ?> - <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->skin->getSkinStylePath( 'images/search-rtl.png' ) ) ); ?> + <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ) ) ); ?> <?php endif; ?> <?php echo $this->makeSearchInput( array( 'id' => 'searchInput', 'type' => 'text' ) ); ?> <?php if ( !$this->data['rtl'] ): ?> - <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->skin->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?> + <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?> <?php endif; ?> - </div> <?php else: ?> - <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); ?> - <?php echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); ?> - <?php echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); ?> + <div> + <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); ?> + <?php echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); ?> + <?php echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); ?> <?php endif; ?> + <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/> + </div> </form> </div> <?php |