From fb348aace8f89901797c8471e9f18086222de79b Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Wed, 23 Apr 2014 21:57:13 +0200
Subject: [PATCH] Update formatting for PHP files in skins/

This impacts HTML output, mostly leading whitespace, I think.
Not sure if that's an issue.

Change-Id: Ia0cc9612d9f5b9ea0cf191b05bf09e2d78d34268
---
 skins/CologneBlue.php | 158 ++++++-----
 skins/Modern.php      | 249 ++++++++--------
 skins/MonoBook.php    | 438 +++++++++++++++--------------
 skins/Vector.php      | 641 ++++++++++++++++++++++--------------------
 4 files changed, 767 insertions(+), 719 deletions(-)

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index bd8a6776ac..ad500ea422 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -284,6 +284,7 @@ class CologneBlueTemplate extends BaseTemplate {
 
 		// Use the regular navigational link, but replace its text. Everything else stays unmodified.
 		$namespacesLinks = $this->data['content_navigation']['namespaces'];
+
 		return $this->processBottomLink( $message, $namespacesLinks[$key], $message );
 	}
 
@@ -318,64 +319,66 @@ class CologneBlueTemplate extends BaseTemplate {
 	 */
 	function beforeContent() {
 		ob_start();
-?>
-<div id="content">
-	<div id="topbar">
-		<p id="sitetitle" role="banner">
-			<a href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>">
-				<?php echo wfMessage( 'sitetitle' )->escaped() ?>
-			</a>
-		</p>
-		<p id="sitesub"><?php echo wfMessage( 'sitesubtitle' )->escaped() ?></p>
-		<div id="linkcollection" role="navigation">
-			<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
-			<?php echo $this->getSkin()->getCategories() ?>
-			<div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
-			<?php
+		?>
+		<div id="content">
+		<div id="topbar">
+			<p id="sitetitle" role="banner">
+				<a href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>">
+					<?php echo wfMessage( 'sitetitle' )->escaped() ?>
+				</a>
+			</p>
+
+			<p id="sitesub"><?php echo wfMessage( 'sitesubtitle' )->escaped() ?></p>
+
+			<div id="linkcollection" role="navigation">
+				<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
+				<?php echo $this->getSkin()->getCategories() ?>
+				<div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
+				<?php
 				if ( $this->data['newtalk'] ) {
-			?>
+					?>
 					<div class="usermessage"><strong><?php echo $this->data['newtalk'] ?></strong></div>
-			<?php
+				<?php
 				}
-			?>
+				?>
+			</div>
 		</div>
-	</div>
-	<div id="article" class="mw-body" role="main">
+		<div id="article" class="mw-body" role="main">
 		<?php
-			if ( $this->getSkin()->getSiteNotice() ) {
-		?>
-				<div id="siteNotice"><?php echo $this->getSkin()->getSiteNotice() ?></div>
+		if ( $this->getSkin()->getSiteNotice() ) {
+			?>
+			<div id="siteNotice"><?php echo $this->getSkin()->getSiteNotice() ?></div>
 		<?php
-			}
+		}
 		?>
 		<h1 id="firstHeading" lang="<?php
-			$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
-			$this->text( 'pageLanguage' );
+		$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+		$this->text( 'pageLanguage' );
 		?>"><span dir="auto"><?php echo $this->data['title'] ?></span></h1>
 		<?php
-			if ( $this->translator->translate( 'tagline' ) ) {
-		?>
-				<p class="tagline"><?php
-					echo htmlspecialchars( $this->translator->translate( 'tagline' ) )
+		if ( $this->translator->translate( 'tagline' ) ) {
+			?>
+			<p class="tagline"><?php
+				echo htmlspecialchars( $this->translator->translate( 'tagline' ) )
 				?></p>
 		<?php
-			}
+		}
 		?>
 		<?php
-			if ( $this->getSkin()->getOutput()->getSubtitle() ) {
-		?>
-				<p class="subtitle"><?php echo $this->getSkin()->getOutput()->getSubtitle() ?></p>
+		if ( $this->getSkin()->getOutput()->getSubtitle() ) {
+			?>
+			<p class="subtitle"><?php echo $this->getSkin()->getOutput()->getSubtitle() ?></p>
 		<?php
-			}
+		}
 		?>
 		<?php
-			if ( $this->getSkin()->subPageSubtitle() ) {
-		?>
-				<p class="subpages"><?php echo $this->getSkin()->subPageSubtitle() ?></p>
+		if ( $this->getSkin()->subPageSubtitle() ) {
+			?>
+			<p class="subpages"><?php echo $this->getSkin()->subPageSubtitle() ?></p>
 		<?php
-			}
+		}
 		?>
-<?php
+		<?php
 		$s = ob_get_contents();
 		ob_end_clean();
 
@@ -387,45 +390,47 @@ class CologneBlueTemplate extends BaseTemplate {
 	 */
 	function afterContent() {
 		ob_start();
-?>
-	</div>
-	<div id="footer">
-		<div id="footer-navigation" role="navigation">
-<?php
-		// Page-related links
-		echo $this->bottomLinks();
-		echo "\n<br />";
-
-		// Footer and second searchbox
-		echo $this->getSkin()->getLanguage()->pipeList( array(
-			$this->getSkin()->mainPageLink(),
-			$this->getSkin()->aboutLink(),
-			$this->searchForm( 'footer' )
-		) );
-?>
+		?>
 		</div>
-		<div id="footer-info" role="contentinfo">
-<?php
-		// Standard footer info
-		$footlinks = $this->getFooterLinks();
-		if ( $footlinks['info'] ) {
-			foreach ( $footlinks['info'] as $item ) {
-				echo $this->data[$item] . ' ';
-			}
-		}
-?>
+		<div id="footer">
+			<div id="footer-navigation" role="navigation">
+				<?php
+				// Page-related links
+				echo $this->bottomLinks();
+				echo "\n<br />";
+
+				// Footer and second searchbox
+				echo $this->getSkin()->getLanguage()->pipeList( array(
+					$this->getSkin()->mainPageLink(),
+					$this->getSkin()->aboutLink(),
+					$this->searchForm( 'footer' )
+				) );
+				?>
+			</div>
+			<div id="footer-info" role="contentinfo">
+				<?php
+				// Standard footer info
+				$footlinks = $this->getFooterLinks();
+				if ( $footlinks['info'] ) {
+					foreach ( $footlinks['info'] as $item ) {
+						echo $this->data[$item] . ' ';
+					}
+				}
+				?>
+			</div>
 		</div>
-	</div>
-</div>
-<div id="mw-navigation">
-	<h2><?php echo wfMessage( 'navigation-heading' )->escaped() ?></h2>
-	<div id="toplinks" role="navigation">
-		<p id="syslinks"><?php echo $this->sysLinks() ?></p>
-		<p id="variantlinks"><?php echo $this->variantLinks() ?></p>
-	</div>
-	<?php echo $this->quickBar() ?>
-</div>
-<?php
+		</div>
+		<div id="mw-navigation">
+			<h2><?php echo wfMessage( 'navigation-heading' )->escaped() ?></h2>
+
+			<div id="toplinks" role="navigation">
+				<p id="syslinks"><?php echo $this->sysLinks() ?></p>
+
+				<p id="variantlinks"><?php echo $this->variantLinks() ?></p>
+			</div>
+			<?php echo $this->quickBar() ?>
+		</div>
+		<?php
 		$s = ob_get_contents();
 		ob_end_clean();
 
@@ -604,6 +609,7 @@ class CologneBlueTemplate extends BaseTemplate {
 		}
 
 		$s .= "</div>\n";
+
 		return $s;
 	}
 
diff --git a/skins/Modern.php b/skins/Modern.php
index 28e918ee00..dd125e957c 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -65,134 +65,141 @@ class ModernTemplate extends MonoBookTemplate {
 		wfSuppressWarnings();
 
 		$this->html( 'headelement' );
-?>
-
-	<!-- heading -->
-	<div id="mw_header"><h1 id="firstHeading" lang="<?php
-		$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
-		$this->text( 'pageLanguage' );
-	?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1></div>
-
-	<div id="mw_main">
-	<div id="mw_contentwrapper">
-	<!-- navigation portlet -->
-<?php $this->cactions(); ?>
-
-	<!-- content -->
-	<div id="mw_content" role="main">
-	<!-- contentholder does nothing by default, but it allows users to style the text inside
-	     the content area without affecting the meaning of 'em' in #mw_content, which is used
-	     for the margins -->
-	<div id="mw_contentholder" class="mw-body">
-		<div class='mw-topboxes'>
-			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
-			<div class="mw-topbox" id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
-			<?php
-				if ( $this->data['newtalk'] ) {
-					?><div class="usermessage mw-topbox"><?php $this->html( 'newtalk' ) ?></div>
-			<?php
-				}
-			?>
-			<?php
-			if ( $this->data['sitenotice'] ) {
-				?><div class="mw-topbox" id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
-			<?php
-			}
-			?>
-		</div>
-
-		<div id="contentSub"<?php
-			$this->html( 'userlangattributes' )
-		?>><?php
-			$this->html( 'subtitle' )
-		?></div>
-
-		<?php
-			if ( $this->data['undelete'] ) {
-				?><div id="contentSub2"><?php $this->html( 'undelete' ) ?></div><?php
-			}
 		?>
-		<div id="jump-to-nav"><?php $this->msg( 'jumpto' ) ?>
-			<a href="#mw_portlets"><?php
-				$this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' )
-			?>
-			<a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a>
-		</div>
-
-		<?php $this->html( 'bodytext' ) ?>
-		<div class='mw_clear'></div>
-		<?php
-			if ( $this->data['catlinks'] ) {
-				$this->html( 'catlinks' );
-			}
-		?>
-		<?php $this->html( 'dataAfterContent' ) ?>
-	</div><!-- mw_contentholder -->
-	</div><!-- mw_content -->
-	</div><!-- mw_contentwrapper -->
-
-	<div id="mw_portlets"<?php $this->html( "userlangattributes" ) ?>>
-	<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
-
-	<!-- portlets -->
-	<?php $this->renderPortals( $this->data['sidebar'] ); ?>
-
-	</div><!-- mw_portlets -->
-
-
-	</div><!-- main -->
-
-	<div class="mw_clear"></div>
 
-	<!-- personal portlet -->
-	<div class="portlet" id="p-personal" role="navigation">
-		<h3><?php $this->msg( 'personaltools' ) ?></h3>
-		<div class="pBody">
-			<ul>
-<?php
-foreach ( $this->getPersonalTools() as $key => $item ) { ?>
-				<?php echo $this->makeListItem( $key, $item ); ?>
-
-<?php
-}
-?>
-			</ul>
+		<!-- heading -->
+		<div id="mw_header"><h1 id="firstHeading" lang="<?php
+			$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+			$this->text( 'pageLanguage' );
+			?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1></div>
+
+		<div id="mw_main">
+			<div id="mw_contentwrapper">
+				<!-- navigation portlet -->
+				<?php $this->cactions(); ?>
+
+				<!-- content -->
+				<div id="mw_content" role="main">
+					<!-- contentholder does nothing by default, but it allows users to style the text inside
+						 the content area without affecting the meaning of 'em' in #mw_content, which is used
+						 for the margins -->
+					<div id="mw_contentholder" class="mw-body">
+						<div class='mw-topboxes'>
+							<div id="mw-js-message"
+								style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
+							<div class="mw-topbox" id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
+							<?php
+							if ( $this->data['newtalk'] ) {
+								?>
+								<div class="usermessage mw-topbox"><?php $this->html( 'newtalk' ) ?></div>
+							<?php
+							}
+							?>
+							<?php
+							if ( $this->data['sitenotice'] ) {
+								?>
+								<div class="mw-topbox" id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
+							<?php
+							}
+							?>
+						</div>
+
+						<div id="contentSub"<?php
+						$this->html( 'userlangattributes' )
+						?>><?php
+							$this->html( 'subtitle' )
+							?></div>
+
+						<?php
+						if ( $this->data['undelete'] ) {
+							?>
+							<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div><?php
+						}
+						?>
+						<div id="jump-to-nav"><?php $this->msg( 'jumpto' ) ?>
+							<a href="#mw_portlets"><?php
+								$this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' )
+							?>
+							<a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a>
+						</div>
+
+						<?php $this->html( 'bodytext' ) ?>
+						<div class='mw_clear'></div>
+						<?php
+						if ( $this->data['catlinks'] ) {
+							$this->html( 'catlinks' );
+						}
+						?>
+						<?php $this->html( 'dataAfterContent' ) ?>
+					</div><!-- mw_contentholder -->
+				</div><!-- mw_content -->
+			</div><!-- mw_contentwrapper -->
+
+			<div id="mw_portlets"<?php $this->html( "userlangattributes" ) ?>>
+				<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
+
+				<!-- portlets -->
+				<?php $this->renderPortals( $this->data['sidebar'] ); ?>
+
+			</div><!-- mw_portlets -->
+
+
+		</div><!-- main -->
+
+		<div class="mw_clear"></div>
+
+		<!-- personal portlet -->
+		<div class="portlet" id="p-personal" role="navigation">
+			<h3><?php $this->msg( 'personaltools' ) ?></h3>
+
+			<div class="pBody">
+				<ul>
+					<?php
+					foreach ( $this->getPersonalTools() as $key => $item ) {
+						?>
+						<?php echo $this->makeListItem( $key, $item ); ?>
+
+					<?php
+					}
+					?>
+				</ul>
+			</div>
 		</div>
-	</div>
 
 
-	<!-- footer -->
-	<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
+		<!-- footer -->
+		<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
 			<ul id="f-list">
-<?php
-		foreach ( $this->getFooterLinks( "flat" ) as $aLink ) {
-			if ( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>				<li id="<?php echo $aLink ?>"><?php $this->html( $aLink ) ?></li>
-<?php
-			}
-		}
-?>
+				<?php
+				foreach ( $this->getFooterLinks( "flat" ) as $aLink ) {
+					if ( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
+						?>
+						<li id="<?php echo $aLink ?>"><?php $this->html( $aLink ) ?></li>
+					<?php
+					}
+				}
+				?>
 			</ul>
-<?php
-		foreach ( $this->getFooterIcons( "nocopyright" ) as $blockName => $footerIcons ) { ?>
-			<div id="mw_<?php echo htmlspecialchars( $blockName ); ?>">
-<?php
-			foreach ( $footerIcons as $icon ) { ?>
-				<?php echo $this->getSkin()->makeFooterIcon( $icon, 'withoutImage' ); ?>
-
-<?php
-			} ?>
-			</div>
-<?php
-		}
-?>
-	</div>
+			<?php
+			foreach ( $this->getFooterIcons( "nocopyright" ) as $blockName => $footerIcons ) {
+				?>
+				<div id="mw_<?php echo htmlspecialchars( $blockName ); ?>">
+					<?php
+					foreach ( $footerIcons as $icon ) {
+						?>
+						<?php echo $this->getSkin()->makeFooterIcon( $icon, 'withoutImage' ); ?>
+
+					<?php
+					} ?>
+				</div>
+			<?php
+			}
+			?>
+		</div>
 
-	<?php $this->printTrail(); ?>
-</body></html>
-<?php
-	wfRestoreWarnings();
+		<?php $this->printTrail(); ?>
+		</body></html>
+		<?php
+		wfRestoreWarnings();
 	} // end of execute() method
 } // end of class
-
-
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index a64e9d00c4..5c44938073 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -52,7 +52,6 @@ class SkinMonoBook extends SkinTemplate {
 		// TODO: Migrate all of these
 		$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
 		$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
-
 	}
 }
 
@@ -75,134 +74,144 @@ class MonoBookTemplate extends BaseTemplate {
 		wfSuppressWarnings();
 
 		$this->html( 'headelement' );
-?><div id="globalWrapper">
-<div id="column-content"><div id="content" class="mw-body-primary" role="main">
-	<a id="top"></a>
-	<?php
-		if ( $this->data['sitenotice'] ) {
-			?><div id="siteNotice"><?php
-			$this->html( 'sitenotice' )
-			?></div><?php
-		}
-	?>
-
-	<h1 id="firstHeading" class="firstHeading" lang="<?php
-		$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
-		$this->text( 'pageLanguage' );
-	?>"><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'] ) { ?>
-		<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
-<?php
+		?><div id="globalWrapper">
+		<div id="column-content">
+			<div id="content" class="mw-body-primary" role="main">
+				<a id="top"></a>
+				<?php
+				if ( $this->data['sitenotice'] ) {
+					?>
+					<div id="siteNotice"><?php
+					$this->html( 'sitenotice' )
+					?></div><?php
+				}
+				?>
+
+				<h1 id="firstHeading" class="firstHeading" lang="<?php
+				$this->data['pageLanguage'] =
+					$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+				$this->text( 'pageLanguage' );
+				?>"><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'] ) { ?>
+						<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
+					<?php
+}
+					?><?php
+					if ( $this->data['newtalk'] ) {
+						?>
+						<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
+					<?php
+					}
+					?>
+					<div id="jump-to-nav" class="mw-jump"><?php
+						$this->msg( 'jumpto' )
+						?> <a href="#column-one"><?php
+							$this->msg( 'jumptonavigation' )
+							?></a><?php
+						$this->msg( 'comma-separator' )
+						?><a href="#searchInput"><?php
+							$this->msg( 'jumptosearch' )
+							?></a></div>
+
+					<!-- start content -->
+					<?php $this->html( 'bodytext' ) ?>
+					<?php
+					if ( $this->data['catlinks'] ) {
+						$this->html( 'catlinks' );
+					}
+					?>
+					<!-- end content -->
+					<?php
+					if ( $this->data['dataAfterContent'] ) {
+						$this->html( 'dataAfterContent'
+						);
+					}
+					?>
+					<div class="visualClear"></div>
+				</div>
+			</div>
+		</div>
+		<div id="column-one"<?php $this->html( 'userlangattributes' ) ?>>
+			<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
+			<?php $this->cactions(); ?>
+			<div class="portlet" id="p-personal" role="navigation">
+				<h3><?php $this->msg( 'personaltools' ) ?></h3>
+
+				<div class="pBody">
+					<ul<?php $this->html( 'userlangattributes' ) ?>>
+						<?php foreach ( $this->getPersonalTools() as $key => $item ) { ?>
+							<?php echo $this->makeListItem( $key, $item ); ?>
+
+						<?php
 }
-?><?php
-		if ( $this->data['newtalk'] ) {
+						?>
+					</ul>
+				</div>
+			</div>
+			<div class="portlet" id="p-logo" role="banner">
+				<?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>
+			<?php
+			$this->renderPortals( $this->data['sidebar'] );
 			?>
-		<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
-<?php
-		}
-		?>
-		<div id="jump-to-nav" class="mw-jump"><?php
-			$this->msg( 'jumpto' )
-		?> <a href="#column-one"><?php
-			$this->msg( 'jumptonavigation' )
-		?></a><?php
-			$this->msg( 'comma-separator' )
-		?><a href="#searchInput"><?php
-			$this->msg( 'jumptosearch' )
-		?></a></div>
-
-		<!-- start content -->
-<?php $this->html( 'bodytext' ) ?>
-		<?php
-		if ( $this->data['catlinks'] ) {
-			$this->html( 'catlinks' );
-		}
-		?>
-		<!-- end content -->
-		<?php
-		if ( $this->data['dataAfterContent'] ) {
-			$this->html( 'dataAfterContent'
-			);
-		}
-		?>
+		</div><!-- end of the left (by default at least) column -->
 		<div class="visualClear"></div>
-	</div>
-</div></div>
-<div id="column-one"<?php $this->html( 'userlangattributes' ) ?>>
-	<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
-<?php $this->cactions(); ?>
-	<div class="portlet" id="p-personal" role="navigation">
-		<h3><?php $this->msg( 'personaltools' ) ?></h3>
-		<div class="pBody">
-			<ul<?php $this->html( 'userlangattributes' ) ?>>
-<?php		foreach ( $this->getPersonalTools() as $key => $item ) { ?>
-				<?php echo $this->makeListItem( $key, $item ); ?>
-
-<?php
-}
-?>
-			</ul>
-		</div>
-	</div>
-	<div class="portlet" id="p-logo" role="banner">
-<?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>
-<?php
-	$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
+		<?php
+		$validFooterIcons = $this->getFooterIcons( "icononly" );
+		$validFooterLinks = $this->getFooterLinks( "flat" ); // Additional footer links
 
-	if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?>
-<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
-<?php
-		$footerEnd = '</div>';
-	} else {
-		$footerEnd = '';
-	}
+		if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) {
+			?>
+			<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
+			<?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->getSkin()->makeFooterIcon( $icon ); ?>
+		foreach ( $validFooterIcons as $blockName => $footerIcons ) {
+			?>
+			<div id="f-<?php echo htmlspecialchars( $blockName ); ?>ico">
+				<?php foreach ( $footerIcons as $icon ) { ?>
+					<?php echo $this->getSkin()->makeFooterIcon( $icon ); ?>
 
-<?php
+				<?php
 }
-?>
-	</div>
-<?php
-	}
+				?>
+			</div>
+		<?php
+		}
 
 		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
+			?>
+			<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>
-<?php
+		</div>
+		<?php
 		$this->printTrail();
 		echo Html::closeElement( 'body' );
 		echo Html::closeElement( 'html' );
@@ -244,38 +253,41 @@ class MonoBookTemplate extends BaseTemplate {
 
 	function searchBox() {
 		global $wgUseTwoButtonsSearchForm;
-?>
-	<div id="p-search" class="portlet" role="search">
-		<h3><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
-		<div id="searchBody" class="pBody">
-			<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
-				<input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
-				<?php echo $this->makeSearchInput( array( "id" => "searchInput" ) ); ?>
-
-				<?php
-				echo $this->makeSearchButton(
-					"go",
-					array( "id" => "searchGoButton", "class" => "searchButton" )
-				);
-
-				if ( $wgUseTwoButtonsSearchForm ) { ?>&#160;
-				<?php echo $this->makeSearchButton(
-						"fulltext",
-						array( "id" => "mw-searchButton", "class" => "searchButton" )
+		?>
+		<div id="p-search" class="portlet" role="search">
+			<h3><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
+
+			<div id="searchBody" class="pBody">
+				<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
+					<input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+					<?php echo $this->makeSearchInput( array( "id" => "searchInput" ) ); ?>
+
+					<?php
+					echo $this->makeSearchButton(
+						"go",
+						array( "id" => "searchGoButton", "class" => "searchButton" )
 					);
-				} else { ?>
 
-				<div><a href="<?php
-					$this->text( 'searchaction' )
-				?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div><?php
-				} ?>
+					if ( $wgUseTwoButtonsSearchForm ) {
+						?>&#160;
+						<?php echo $this->makeSearchButton(
+							"fulltext",
+							array( "id" => "mw-searchButton", "class" => "searchButton" )
+						);
+					} else {
+						?>
+
+						<div><a href="<?php
+						$this->text( 'searchaction' )
+						?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div><?php
+					} ?>
 
-			</form>
+				</form>
 
-			<?php $this->renderAfterPortlet( 'search' ); ?>
+				<?php $this->renderAfterPortlet( 'search' ); ?>
+			</div>
 		</div>
-	</div>
-<?php
+	<?php
 	}
 
 	/**
@@ -283,65 +295,70 @@ class MonoBookTemplate extends BaseTemplate {
 	 * Shared between MonoBook and Modern
 	 */
 	function cactions() {
-?>
-	<div id="p-cactions" class="portlet" role="navigation">
-		<h3><?php $this->msg( 'views' ) ?></h3>
-		<div class="pBody">
-			<ul><?php
-				foreach ( $this->data['content_actions'] as $key => $tab ) {
-					echo '
+		?>
+		<div id="p-cactions" class="portlet" role="navigation">
+			<h3><?php $this->msg( 'views' ) ?></h3>
+
+			<div class="pBody">
+				<ul><?php
+					foreach ( $this->data['content_actions'] as $key => $tab ) {
+						echo '
 				' . $this->makeListItem( $key, $tab );
-				} ?>
+					} ?>
 
-			</ul>
-<?php		$this->renderAfterPortlet( 'cactions' ); ?>
+				</ul>
+				<?php $this->renderAfterPortlet( 'cactions' ); ?>
+			</div>
 		</div>
-	</div>
-<?php
+	<?php
 	}
+
 	/*************************************************************************************************/
 	function toolbox() {
-?>
-	<div class="portlet" id="p-tb" role="navigation">
-		<h3><?php $this->msg( 'toolbox' ) ?></h3>
-		<div class="pBody">
-			<ul>
-<?php
-		foreach ( $this->getToolbox() as $key => $tbitem ) { ?>
-				<?php echo $this->makeListItem( $key, $tbitem ); ?>
-
-<?php
-		}
-		wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
-		wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
-?>
-			</ul>
-<?php		$this->renderAfterPortlet( 'tb' ); ?>
+		?>
+		<div class="portlet" id="p-tb" role="navigation">
+			<h3><?php $this->msg( 'toolbox' ) ?></h3>
+
+			<div class="pBody">
+				<ul>
+					<?php
+					foreach ( $this->getToolbox() as $key => $tbitem ) {
+						?>
+						<?php echo $this->makeListItem( $key, $tbitem ); ?>
+
+					<?php
+					}
+					wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
+					wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+					?>
+				</ul>
+				<?php $this->renderAfterPortlet( 'tb' ); ?>
+			</div>
 		</div>
-	</div>
-<?php
+	<?php
 	}
 
 	/*************************************************************************************************/
 	function languageBox() {
 		if ( $this->data['language_urls'] !== false ) {
-?>
-	<div id="p-lang" class="portlet" role="navigation">
-		<h3<?php $this->html( 'userlangattributes' ) ?>><?php $this->msg( 'otherlanguages' ) ?></h3>
-		<div class="pBody">
-			<ul>
-<?php		foreach ( $this->data['language_urls'] as $key => $langlink ) { ?>
-				<?php echo $this->makeListItem( $key, $langlink ); ?>
+			?>
+			<div id="p-lang" class="portlet" role="navigation">
+				<h3<?php $this->html( 'userlangattributes' ) ?>><?php $this->msg( 'otherlanguages' ) ?></h3>
 
-<?php
+				<div class="pBody">
+					<ul>
+						<?php foreach ( $this->data['language_urls'] as $key => $langlink ) { ?>
+							<?php echo $this->makeListItem( $key, $langlink ); ?>
+
+						<?php
 }
-?>
-			</ul>
+						?>
+					</ul>
 
-<?php		$this->renderAfterPortlet( 'lang' ); ?>
-		</div>
-	</div>
-<?php
+					<?php $this->renderAfterPortlet( 'lang' ); ?>
+				</div>
+			</div>
+		<?php
 		}
 	}
 
@@ -363,34 +380,33 @@ class MonoBookTemplate extends BaseTemplate {
 		}
 		echo '	' . Html::openElement( 'div', $portletAttribs );
 		$msgObj = wfMessage( $bar );
-?>
+		?>
 
 		<h3><?php echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $bar ); ?></h3>
 		<div class='pBody'>
-<?php
-if ( is_array( $cont ) ) {
-	?>
-			<ul>
-<?php
-foreach ( $cont as $key => $val ) {
-	?>
-				<?php echo $this->makeListItem( $key, $val ); ?>
-
-<?php
-}
-?>
-			</ul>
-<?php
-} else {
-			# allow raw HTML block to be defined by extensions
-			print $cont;
-}
+			<?php
+			if ( is_array( $cont ) ) {
+				?>
+				<ul>
+					<?php
+					foreach ( $cont as $key => $val ) {
+						?>
+						<?php echo $this->makeListItem( $key, $val ); ?>
+
+					<?php
+					}
+					?>
+				</ul>
+			<?php
+			} else {
+				# allow raw HTML block to be defined by extensions
+				print $cont;
+			}
 
-		$this->renderAfterPortlet( $bar );
-?>
+			$this->renderAfterPortlet( $bar );
+			?>
 		</div>
-	</div>
-<?php
+		</div>
+	<?php
 	}
-
 } // end of class
diff --git a/skins/Vector.php b/skins/Vector.php
index e412c9ce59..a8d34776a6 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -157,86 +157,87 @@ class VectorTemplate extends BaseTemplate {
 		}
 		// Output HTML Page
 		$this->html( 'headelement' );
-?>
+		?>
 		<div id="mw-page-base" class="noprint"></div>
 		<div id="mw-head-base" class="noprint"></div>
 		<div id="content" class="mw-body" role="main">
 			<a id="top"></a>
+
 			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
 			<?php
-if ( $this->data['sitenotice'] ) {
-	?>
-			<div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
+			if ( $this->data['sitenotice'] ) {
+				?>
+				<div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
 			<?php
-}
+			}
 			?>
 			<h1 id="firstHeading" class="firstHeading" lang="<?php
-				$this->data['pageLanguage'] =
-					$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
-				$this->text( 'pageLanguage' );
+			$this->data['pageLanguage'] =
+				$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+			$this->text( 'pageLanguage' );
 			?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1>
 			<?php $this->html( 'prebodyhtml' ) ?>
 			<div id="bodyContent">
 				<?php
-if ( $this->data['isarticle'] ) {
-	?>
-				<div id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
+				if ( $this->data['isarticle'] ) {
+					?>
+					<div id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
 				<?php
-}
+				}
 				?>
 				<div id="contentSub"<?php
-					$this->html( 'userlangattributes' )
+				$this->html( 'userlangattributes' )
 				?>><?php $this->html( 'subtitle' ) ?></div>
 				<?php
-if ( $this->data['undelete'] ) {
-	?>
-				<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
+				if ( $this->data['undelete'] ) {
+					?>
+					<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
 				<?php
-}
+				}
 				?>
 				<?php
-if ( $this->data['newtalk'] ) {
-	?>
-				<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
+				if ( $this->data['newtalk'] ) {
+					?>
+					<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
 				<?php
-}
+				}
 				?>
 				<div id="jump-to-nav" class="mw-jump">
 					<?php $this->msg( 'jumpto' ) ?>
 					<a href="#mw-navigation"><?php
 						$this->msg( 'jumptonavigation' )
-					?></a><?php
-						$this->msg( 'comma-separator' )
+						?></a><?php
+					$this->msg( 'comma-separator' )
 					?>
 					<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
 				</div>
 				<?php $this->html( 'bodycontent' ) ?>
 				<?php
-if ( $this->data['printfooter'] ) {
-	?>
-				<div class="printfooter">
-				<?php $this->html( 'printfooter' ); ?>
-				</div>
+				if ( $this->data['printfooter'] ) {
+					?>
+					<div class="printfooter">
+						<?php $this->html( 'printfooter' ); ?>
+					</div>
 				<?php
-}
+				}
 				?>
 				<?php
-if ( $this->data['catlinks'] ) {
-	?>
-				<?php
-	$this->html( 'catlinks' );
-	?>
+				if ( $this->data['catlinks'] ) {
+					?>
+					<?php
+					$this->html( 'catlinks' );
+					?>
 				<?php
-}
+				}
 				?>
 				<?php
-if ( $this->data['dataAfterContent'] ) {
-	?>
-				<?php
-	$this->html( 'dataAfterContent' );
-	?>
+				if ( $this->data['dataAfterContent'] ) {
+					?>
+					<?php
+					$this->html( 'dataAfterContent' );
+					?>
 				<?php
-}
+				}
 				?>
 				<div class="visualClear"></div>
 				<?php $this->html( 'debughtml' ); ?>
@@ -244,6 +245,7 @@ if ( $this->data['dataAfterContent'] ) {
 		</div>
 		<div id="mw-navigation">
 			<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
+
 			<div id="mw-head">
 				<?php $this->renderNavigation( 'PERSONAL' ); ?>
 				<div id="left-navigation">
@@ -254,62 +256,63 @@ if ( $this->data['dataAfterContent'] ) {
 				</div>
 			</div>
 			<div id="mw-panel">
-					<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'] )
+				<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' ) )
+					echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
 					?>></a></div>
 				<?php $this->renderPortals( $this->data['sidebar'] ); ?>
 			</div>
 		</div>
 		<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
 			<?php
-foreach ( $this->getFooterLinks() as $category => $links ) {
-	?>
+			foreach ( $this->getFooterLinks() as $category => $links ) {
+				?>
 				<ul id="footer-<?php
-	echo $category
+				echo $category
 				?>">
 					<?php
-	foreach ( $links as $link ) {
-		?>
+					foreach ( $links as $link ) {
+						?>
 						<li id="footer-<?php
-		echo $category
+						echo $category
 						?>-<?php
-		echo $link
+						echo $link
 						?>"><?php
-		$this->html( $link )
-						?></li>
+							$this->html( $link )
+							?></li>
 					<?php
-	}
+					}
 					?>
 				</ul>
 			<?php
-}
+			}
 			?>
 			<?php $footericons = $this->getFooterIcons( "icononly" );
-			if ( count( $footericons ) > 0 ) { ?>
+			if ( count( $footericons ) > 0 ) {
+				?>
 				<ul id="footer-icons" class="noprint">
-	<?php
-foreach ( $footericons as $blockName => $footerIcons ) {
-	?>
-					<li id="footer-<?php
-	echo htmlspecialchars( $blockName ); ?>ico">
-<?php
-	foreach ( $footerIcons as $icon ) {
-		?>
-						<?php
-		echo $this->getSkin()->makeFooterIcon( $icon );
-		?>
+					<?php
+					foreach ( $footericons as $blockName => $footerIcons ) {
+						?>
+						<li id="footer-<?php
+						echo htmlspecialchars( $blockName ); ?>ico">
+							<?php
+							foreach ( $footerIcons as $icon ) {
+								?>
+								<?php
+								echo $this->getSkin()->makeFooterIcon( $icon );
+								?>
 
-<?php
-	}
-?>
-					</li>
-<?php
-}
-?>
+							<?php
+							}
+							?>
+						</li>
+					<?php
+					}
+					?>
 				</ul>
 			<?php
 			}
@@ -318,9 +321,9 @@ foreach ( $footericons as $blockName => $footerIcons ) {
 		</div>
 		<?php $this->printTrail(); ?>
 
-	</body>
-</html>
-<?php
+		</body>
+		</html>
+	<?php
 	}
 
 	/**
@@ -358,7 +361,7 @@ foreach ( $footericons as $blockName => $footerIcons ) {
 					break;
 				default:
 					$this->renderPortal( $name, $content );
-				break;
+					break;
 			}
 		}
 	}
@@ -375,44 +378,48 @@ foreach ( $footericons as $blockName => $footerIcons ) {
 		}
 		$msgObj = wfMessage( $msg );
 		?>
-<div class="portal" role="navigation" id='<?php
-	echo Sanitizer::escapeId( "p-$name" )
-?>'<?php
-	echo Linker::tooltip( 'p-' . $name )
-?> aria-labelledby='<?php echo Sanitizer::escapeId( "p-$name-label" ) ?>'>
-	<h3<?php
-		$this->html( 'userlangattributes' )
-	?> id='<?php
-		echo Sanitizer::escapeId( "p-$name-label" )
-	?>'><?php
-		echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg );
-	?></h3>
-	<div class="body">
-<?php
-		if ( is_array( $content ) ) { ?>
-		<ul>
-<?php
-			foreach ( $content as $key => $val ) { ?>
-			<?php echo $this->makeListItem( $key, $val ); ?>
+		<div class="portal" role="navigation" id='<?php
+		echo Sanitizer::escapeId( "p-$name" )
+		?>'<?php
+		echo Linker::tooltip( 'p-' . $name )
+		?> aria-labelledby='<?php echo Sanitizer::escapeId( "p-$name-label" ) ?>'>
+			<h3<?php
+			$this->html( 'userlangattributes' )
+			?> id='<?php
+			echo Sanitizer::escapeId( "p-$name-label" )
+			?>'><?php
+				echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg );
+				?></h3>
 
-<?php
-			}
-			if ( $hook !== null ) {
-				wfRunHooks( $hook, array( &$this, true ) );
-			}
-			?>
-		</ul>
-<?php
-		} else { ?>
-		<?php
-			echo $content; /* Allow raw HTML block to be defined by extensions */
-		}
+			<div class="body">
+				<?php
+				if ( is_array( $content ) ) {
+					?>
+					<ul>
+						<?php
+						foreach ( $content as $key => $val ) {
+							?>
+							<?php echo $this->makeListItem( $key, $val ); ?>
 
-		$this->renderAfterPortlet( $name );
-		?>
-	</div>
-</div>
-<?php
+						<?php
+						}
+						if ( $hook !== null ) {
+							wfRunHooks( $hook, array( &$this, true ) );
+						}
+						?>
+					</ul>
+				<?php
+				} else {
+					?>
+					<?php
+					echo $content; /* Allow raw HTML block to be defined by extensions */
+				}
+
+				$this->renderAfterPortlet( $name );
+				?>
+			</div>
+		</div>
+	<?php
 	}
 
 	/**
@@ -428,7 +435,7 @@ foreach ( $footericons as $blockName => $footerIcons ) {
 		// flexible arguments
 		if ( !is_array( $elements ) ) {
 			$elements = array( $elements );
-		// If there's a series of elements, reverse them when in RTL mode
+			// If there's a series of elements, reverse them when in RTL mode
 		} elseif ( $this->data['rtl'] ) {
 			$elements = array_reverse( $elements );
 		}
@@ -436,207 +443,219 @@ foreach ( $footericons as $blockName => $footerIcons ) {
 		foreach ( $elements as $name => $element ) {
 			switch ( $element ) {
 				case 'NAMESPACES':
-?>
-<div id="p-namespaces" role="navigation" class="vectorTabs<?php
-if ( count( $this->data['namespace_urls'] ) == 0 ) {
-	echo ' emptyPortlet';
-}
-?>" aria-labelledby="p-namespaces-label">
-	<h3 id="p-namespaces-label"><?php $this->msg( 'namespaces' ) ?></h3>
-	<ul<?php $this->html( 'userlangattributes' ) ?>>
-		<?php
-foreach ( $this->data['namespace_urls'] as $link ) {
-	?>
-			<li <?php
-	echo $link['attributes']
-		?>><span><a href="<?php
-	echo htmlspecialchars( $link['href'] )
-		?>" <?php
-	echo $link['key']
-		?>><?php
-	echo htmlspecialchars( $link['text'] )
-		?></a></span></li>
-		<?php
-}
-		?>
-	</ul>
-</div>
-<?php
-				break;
+					?>
+					<div id="p-namespaces" role="navigation" class="vectorTabs<?php
+					if ( count( $this->data['namespace_urls'] ) == 0 ) {
+						echo ' emptyPortlet';
+					}
+					?>" aria-labelledby="p-namespaces-label">
+						<h3 id="p-namespaces-label"><?php $this->msg( 'namespaces' ) ?></h3>
+						<ul<?php $this->html( 'userlangattributes' ) ?>>
+							<?php
+							foreach ( $this->data['namespace_urls'] as $link ) {
+								?>
+								<li <?php
+								echo $link['attributes']
+								?>><span><a href="<?php
+										echo htmlspecialchars( $link['href'] )
+										?>" <?php
+										echo $link['key']
+										?>><?php
+											echo htmlspecialchars( $link['text'] )
+											?></a></span></li>
+							<?php
+							}
+							?>
+						</ul>
+					</div>
+					<?php
+					break;
 				case 'VARIANTS':
-?>
-<div id="p-variants" role="navigation" class="vectorMenu<?php
-if ( count( $this->data['variant_urls'] ) == 0 ) {
-	echo ' emptyPortlet';
-}
-?>" aria-labelledby="p-variants-label">
-	<h3 id="mw-vector-current-variant">
-	<?php
-foreach ( $this->data['variant_urls'] as $link ) { ?>
-		<?php
-	if ( stripos( $link['attributes'], 'selected' ) !== false ) {
-			?>
-			<?php
-		echo htmlspecialchars( $link['text'] )
-			?>
-		<?php
-	}
-		?>
-	<?php
-}
-	?>
-	</h3>
-	<h3 id="p-variants-label"><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h3>
-	<div class="menu">
-		<ul>
-			<?php
-foreach ( $this->data['variant_urls'] as $link ) {
-	?>
-				<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
-}
-			?>
-		</ul>
-	</div>
-</div>
-<?php
-				break;
+					?>
+					<div id="p-variants" role="navigation" class="vectorMenu<?php
+					if ( count( $this->data['variant_urls'] ) == 0 ) {
+						echo ' emptyPortlet';
+					}
+					?>" aria-labelledby="p-variants-label">
+						<h3 id="mw-vector-current-variant">
+							<?php
+							foreach ( $this->data['variant_urls'] as $link ) {
+								?>
+								<?php
+								if ( stripos( $link['attributes'], 'selected' ) !== false ) {
+									?>
+									<?php
+									echo htmlspecialchars( $link['text'] )
+									?>
+								<?php
+								}
+								?>
+							<?php
+							}
+							?>
+						</h3>
+
+						<h3 id="p-variants-label"><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h3>
+
+						<div class="menu">
+							<ul>
+								<?php
+								foreach ( $this->data['variant_urls'] as $link ) {
+									?>
+									<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
+								}
+								?>
+							</ul>
+						</div>
+					</div>
+					<?php
+					break;
 				case 'VIEWS':
-?>
-<div id="p-views" role="navigation" class="vectorTabs<?php
-if ( count( $this->data['view_urls'] ) == 0 ) {
-	echo ' emptyPortlet';
-}
-?>" aria-labelledby="p-views-label">
-	<h3 id="p-views-label"><?php $this->msg( 'views' ) ?></h3>
-	<ul<?php
-	$this->html( 'userlangattributes' )
-	?>>
-		<?php
-	foreach ( $this->data['view_urls'] as $link ) {
-		?>
-			<li<?php
-		echo $link['attributes']
-			?>><span><a href="<?php
-		echo htmlspecialchars( $link['href'] )
-			?>" <?php
-		echo $link['key']
-			?>><?php
-		// $link['text'] can be undefined - bug 27764
-		if ( array_key_exists( 'text', $link ) ) {
-			echo array_key_exists( 'img', $link )
-				? '<img src="' . $link['img'] . '" alt="' . $link['text'] . '" />'
-				: htmlspecialchars( $link['text'] );
-		}
-				?></a></span></li>
-		<?php
-	}
-		?>
-	</ul>
-</div>
-<?php
-				break;
+					?>
+					<div id="p-views" role="navigation" class="vectorTabs<?php
+					if ( count( $this->data['view_urls'] ) == 0 ) {
+						echo ' emptyPortlet';
+					}
+					?>" aria-labelledby="p-views-label">
+						<h3 id="p-views-label"><?php $this->msg( 'views' ) ?></h3>
+						<ul<?php
+						$this->html( 'userlangattributes' )
+						?>>
+							<?php
+							foreach ( $this->data['view_urls'] as $link ) {
+								?>
+								<li<?php
+								echo $link['attributes']
+								?>><span><a href="<?php
+										echo htmlspecialchars( $link['href'] )
+										?>" <?php
+										echo $link['key']
+										?>><?php
+											// $link['text'] can be undefined - bug 27764
+											if ( array_key_exists( 'text', $link ) ) {
+												echo array_key_exists( 'img', $link )
+													? '<img src="' . $link['img'] . '" alt="' . $link['text'] . '" />'
+													: htmlspecialchars( $link['text'] );
+											}
+											?></a></span></li>
+							<?php
+							}
+							?>
+						</ul>
+					</div>
+					<?php
+					break;
 				case 'ACTIONS':
-?>
-<div id="p-cactions" role="navigation" class="vectorMenu<?php
-if ( count( $this->data['action_urls'] ) == 0 ) {
-	echo ' emptyPortlet';
-}
-?>" aria-labelledby="p-cactions-label">
-	<h3 id="p-cactions-label"><span><?php $this->msg( 'actions' ) ?></span><a href="#"></a></h3>
-	<div class="menu">
-		<ul<?php $this->html( 'userlangattributes' ) ?>>
-			<?php
-foreach ( $this->data['action_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>
-			<?php
-}
-			?>
-		</ul>
-	</div>
-</div>
-<?php
-				break;
+					?>
+					<div id="p-cactions" role="navigation" class="vectorMenu<?php
+					if ( count( $this->data['action_urls'] ) == 0 ) {
+						echo ' emptyPortlet';
+					}
+					?>" aria-labelledby="p-cactions-label">
+						<h3 id="p-cactions-label"><span><?php $this->msg( 'actions' ) ?></span><a href="#"></a></h3>
+
+						<div class="menu">
+							<ul<?php $this->html( 'userlangattributes' ) ?>>
+								<?php
+								foreach ( $this->data['action_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>
+								<?php
+								}
+								?>
+							</ul>
+						</div>
+					</div>
+					<?php
+					break;
 				case 'PERSONAL':
-?>
-<div id="p-personal" role="navigation" class="<?php
-		if ( count( $this->data['personal_urls'] ) == 0 ) {
-			echo ' emptyPortlet';
-		}
-	?>" aria-labelledby="p-personal-label">
-	<h3 id="p-personal-label"><?php $this->msg( 'personaltools' ) ?></h3>
-	<ul<?php $this->html( 'userlangattributes' ) ?>>
-<?php
-					$personalTools = $this->getPersonalTools();
-					foreach ( $personalTools as $key => $item ) {
-						echo $this->makeListItem( $key, $item );
+					?>
+					<div id="p-personal" role="navigation" class="<?php
+					if ( count( $this->data['personal_urls'] ) == 0 ) {
+						echo ' emptyPortlet';
 					}
-?>
-	</ul>
-</div>
-<?php
-				break;
+					?>" aria-labelledby="p-personal-label">
+						<h3 id="p-personal-label"><?php $this->msg( 'personaltools' ) ?></h3>
+						<ul<?php $this->html( 'userlangattributes' ) ?>>
+							<?php
+							$personalTools = $this->getPersonalTools();
+							foreach ( $personalTools as $key => $item ) {
+								echo $this->makeListItem( $key, $item );
+							}
+							?>
+						</ul>
+					</div>
+					<?php
+					break;
 				case 'SEARCH':
-?>
-<div id="p-search" role="search">
-	<h3<?php $this->html( 'userlangattributes' ) ?>>
-		<label for="searchInput"><?php $this->msg( 'search' ) ?></label>
-	</h3>
-	<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
-		<?php
-if ( $wgVectorUseSimpleSearch ) {
-		?>
-			<div id="simpleSearch">
-		<?php
-} else {
-		?>
-			<div>
-		<?php
-}
-		?>
-			<?php
-			echo $this->makeSearchInput( array( 'id' => 'searchInput' ) );
-			echo Html::hidden( 'title', $this->get( 'searchtitle' ) );
-			// We construct two buttons (for 'go' and 'fulltext' search modes), but only one will be
-			// visible and actionable at a time (they are overlaid on top of each other in CSS).
-			// * Browsers will use the 'fulltext' one by default (as it's the first in tree-order), which
-			//   is desirable when they are unable to show search suggestions (either due to being broken
-			//   or having JavaScript turned off).
-			// * The mediawiki.searchSuggest module, after doing tests for the broken browsers, removes
-			//   the 'fulltext' button and handles 'fulltext' search itself; this will reveal the 'go'
-			//   button and cause it to be used.
-			echo $this->makeSearchButton(
-				'fulltext',
-				array( 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' )
-			);
-			echo $this->makeSearchButton( 'go', array( 'id' => 'searchButton', 'class' => 'searchButton' ) );
-			?>
-		</div>
-	</form>
-</div>
-<?php
+					?>
+					<div id="p-search" role="search">
+						<h3<?php $this->html( 'userlangattributes' ) ?>>
+							<label for="searchInput"><?php $this->msg( 'search' ) ?></label>
+						</h3>
+
+						<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
+							<?php
+							if ($wgVectorUseSimpleSearch) {
+							?>
+							<div id="simpleSearch">
+								<?php
+							} else {
+							?>
+								<div>
+									<?php
+							}
+							?>
+							<?php
+							echo $this->makeSearchInput( array( 'id' => 'searchInput' ) );
+							echo Html::hidden( 'title', $this->get( 'searchtitle' ) );
+							// We construct two buttons (for 'go' and 'fulltext' search modes),
+							// but only one will be visible and actionable at a time (they are
+							// overlaid on top of each other in CSS).
+							// * Browsers will use the 'fulltext' one by default (as it's the
+							//   first in tree-order), which is desirable when they are unable
+							//   to show search suggestions (either due to being broken or
+							//   having JavaScript turned off).
+							// * The mediawiki.searchSuggest module, after doing tests for the
+							//   broken browsers, removes the 'fulltext' button and handles
+							//   'fulltext' search itself; this will reveal the 'go' button and
+							//   cause it to be used.
+							echo $this->makeSearchButton(
+								'fulltext',
+								array( 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' )
+							);
+							echo $this->makeSearchButton(
+								'go',
+								array( 'id' => 'searchButton', 'class' => 'searchButton' )
+							);
+							?>
+								</div>
+						</form>
+					</div>
+					<?php
 
-				break;
+					break;
 			}
 		}
 	}
-- 
2.20.1