Merge changes Id1ac2f8b,I48f8cd17,I10481ce6,Id4530499

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

diff --git a/skins/Vector.php b/skins/Vector.php
index a9c4494..d1b51a6 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -72,7 +72,7 @@ class VectorTemplate extends BaseTemplate {
                $nav = $this->data['content_navigation'];
 
                if ( $wgVectorUseIconWatch ) {
-                       $mode = $this->getSkin()->getTitle()->userIsWatching() ? 'unwatch' : 'watch';
+                       $mode = $this->getSkin()->getRelevantTitle()->userIsWatching() ? 'unwatch' : 'watch';
                        if ( isset( $nav['actions'][$mode] ) ) {
                                $nav['views'][$mode] = $nav['actions'][$mode];
                                $nav['views'][$mode]['class'] = rtrim( 'icon ' . $nav['views'][$mode]['class'], ' ' );
@@ -134,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">
@@ -236,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>
@@ -251,7 +250,7 @@ class VectorTemplate extends BaseTemplate {
         *
         * @param $portals array
         */
-       private function renderPortals( $portals ) {
+       protected function renderPortals( $portals ) {
                // Force the rendering of the following portals
                if ( !isset( $portals['SEARCH'] ) ) {
                        $portals['SEARCH'] = true;
@@ -287,7 +286,13 @@ class VectorTemplate extends BaseTemplate {
                }
        }
 
-       private function renderPortal( $name, $content, $msg = null, $hook = null ) {
+       /**
+        * @param $name string
+        * @param $content array
+        * @param $msg null|string
+        * @param $hook null|string|array
+        */
+       protected function renderPortal( $name, $content, $msg = null, $hook = null ) {
                if ( $msg === null ) {
                        $msg = $name;
                }
@@ -325,8 +330,8 @@ class VectorTemplate extends BaseTemplate {
         *
         * @param $elements array
         */
-       private function renderNavigation( $elements ) {
-               global $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
+       protected function renderNavigation( $elements ) {
+               global $wgVectorUseSimpleSearch;
 
                // If only one element was given, wrap it in an array, allowing more
                // flexible arguments
@@ -355,20 +360,18 @@ 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' ) ?>>
+               <ul>
                        <?php foreach ( $this->data['variant_urls'] as $link ): ?>
-                               <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
+                               <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" lang="<?php echo htmlspecialchars( $link['lang'] ) ?>" hreflang="<?php echo htmlspecialchars( $link['hreflang'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
                        <?php endforeach; ?>
                </ul>
        </div>
@@ -424,22 +427,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 && $this->getSkin()->getUser()->getOption( 'vector-simplesearch' ) ): ?>
                <div id="simpleSearch">
                        <?php if ( $this->data['rtl'] ): ?>
-                       <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ) ) ); ?>
+                       <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ), 'width' => '12', 'height' => '13' ) ); ?>
                        <?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->getSkin()->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?>
+                       <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ), 'width' => '12', 'height' => '13' ) ); ?>
                        <?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