X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FVector.php;h=3e01d23b82a5f504a7e26f9b53d99c2c854f7a84;hb=90797afe5366458d37046c34f3a2583aade361f5;hp=92eb3ad02ff54e11911bf484d5434fd6774c6d1d;hpb=a42a464e6375bb47f0147f6041253e5d0aab9296;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/Vector.php b/skins/Vector.php
index 92eb3ad02f..3e01d23b82 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -65,7 +65,7 @@ class SkinVector extends SkinTemplate {
 	 * fixes bug 22916
 	 * @param $out OutputPage object
 	 */
-	function setupSkinUserCss( OutputPage $out ){
+	function setupSkinUserCss( OutputPage $out ) {
 		parent::setupSkinUserCss( $out );
 		$out->addModuleStyles( 'skins.vector' );
 	}
@@ -166,7 +166,7 @@ class VectorTemplate extends BaseTemplate {
 			<?php endif; ?>
 			<!-- firstHeading -->
 			<h1 id="firstHeading" class="firstHeading" lang="<?php
-				$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageLanguage()->getCode();
+				$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
 				$this->html( 'pageLanguage' );
 			?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1>
 			<!-- /firstHeading -->
@@ -194,7 +194,7 @@ class VectorTemplate extends BaseTemplate {
 				<!-- jumpto -->
 				<div id="jump-to-nav" class="mw-jump">
 					<?php $this->msg( 'jumpto' ) ?>
-					<a href="#mw-head"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
+					<a href="#mw-navigation"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
 					<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
 				</div>
 				<!-- /jumpto -->
@@ -230,7 +230,7 @@ class VectorTemplate extends BaseTemplate {
 		<div id="mw-navigation">
 			<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
 			<!-- header -->
-			<div id="mw-head" class="noprint">
+			<div id="mw-head">
 				<?php $this->renderNavigation( 'PERSONAL' ); ?>
 				<div id="left-navigation">
 					<?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
@@ -241,7 +241,7 @@ class VectorTemplate extends BaseTemplate {
 			</div>
 			<!-- /header -->
 			<!-- panel -->
-			<div id="mw-panel" class="noprint">
+			<div id="mw-panel">
 				<!-- logo -->
 					<div id="p-logo" role="banner"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ) ?>></a></div>
 				<!-- /logo -->
@@ -367,7 +367,7 @@ class VectorTemplate extends BaseTemplate {
 	 * @param $elements array
 	 */
 	protected function renderNavigation( $elements ) {
-		global $wgVectorUseSimpleSearch, $wgVectorCombineUserTalk;
+		global $wgVectorUseSimpleSearch;
 
 		// If only one element was given, wrap it in an array, allowing more
 		// flexible arguments
@@ -452,20 +452,6 @@ class VectorTemplate extends BaseTemplate {
 	<ul<?php $this->html( 'userlangattributes' ) ?>>
 <?php
 					$personalTools = $this->getPersonalTools();
-					if ( $wgVectorCombineUserTalk && isset( $personalTools['userpage'] ) ) {
-?>
-		<li>
-<?php
-						echo $this->makeListItem( 'userpage', $personalTools['userpage'], array( 'tag' => 'span' ) );
-?> <?php
-						$personalTools['mytalk']['links'][0]['text'] = $this->getMsg( 'mytalk-parenthetical' )->text();
-						$talkItem = $this->makeListItem( 'mytalk', $personalTools['mytalk'], array( 'tag' => 'span' ) );
-						echo $this->getMsg( 'parentheses' )->rawParams( $talkItem )->escaped();
-						unset( $personalTools['userpage'], $personalTools['mytalk'] );
-?>
-		</li>
-<?php
-					}
 					foreach ( $personalTools as $key => $item ) {
 						echo $this->makeListItem( $key, $item );
 					}