Merge "Load previous tags in ChangeTags::addTags() from DB_MASTER"

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

diff --git a/skins/Vector.php b/skins/Vector.php
index a8d3477..9544d55 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -32,7 +32,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * @ingroup Skins
  */
 class SkinVector extends SkinTemplate {
-       public $useHeadElement = true;
        public $skinname = 'vector';
        public $stylename = 'vector';
        public $template = 'VectorTemplate';
@@ -58,7 +57,7 @@ class SkinVector extends SkinTemplate {
                                "/{$this->stylename}/csshover{$min}.htc\")}</style><![endif]-->"
                );
 
-               $out->addModules( array( 'skins.vector.js', 'skins.vector.collapsibleNav' ) );
+               $out->addModules( array( 'skins.vector.js' ) );
        }
 
        /**
@@ -68,7 +67,7 @@ class SkinVector extends SkinTemplate {
        function setupSkinUserCss( OutputPage $out ) {
                parent::setupSkinUserCss( $out );
 
-               $styles = array( 'skins.common.interface', 'skins.vector.styles' );
+               $styles = array( 'mediawiki.skinning.interface', 'skins.vector.styles' );
                wfRunHooks( 'SkinVectorStyleModules', array( $this, &$styles ) );
                $out->addModuleStyles( $styles );
        }
@@ -177,7 +176,7 @@ class VectorTemplate extends BaseTemplate {
                        $this->text( 'pageLanguage' );
                        ?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1>
                        <?php $this->html( 'prebodyhtml' ) ?>
-                       <div id="bodyContent">
+                       <div id="bodyContent" class="mw-body-content">
                                <?php
                                if ( $this->data['isarticle'] ) {
                                        ?>
@@ -321,8 +320,8 @@ class VectorTemplate extends BaseTemplate {
                </div>
                <?php $this->printTrail(); ?>
 
-               </body>
-               </html>
+       </body>
+</html>
        <?php
        }
 
@@ -565,7 +564,7 @@ class VectorTemplate extends BaseTemplate {
                                                echo ' emptyPortlet';
                                        }
                                        ?>" aria-labelledby="p-cactions-label">
-                                               <h3 id="p-cactions-label"><span><?php $this->msg( 'actions' ) ?></span><a href="#"></a></h3>
+                                               <h3 id="p-cactions-label"><span><?php $this->msg( 'vector-more-actions' ) ?></span><a href="#"></a></h3>
 
                                                <div class="menu">
                                                        <ul<?php $this->html( 'userlangattributes' ) ?>>