From: Krinkle <ttijhof@wikimedia.org>
Date: Tue, 28 Aug 2012 20:58:41 +0000 (+0000)
Subject: Merge "(bug 39680) Convert valign to CSS vertical-align"
X-Git-Tag: 1.31.0-rc.0~22565
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=93df73c7af5373271ec8fc6d7f2b6d16b23efdf9;hp=32048d4e578d89a8ae4606b0f1b787fa4e950a2c;p=lhc%2Fweb%2Fwiklou.git

Merge "(bug 39680) Convert valign to CSS vertical-align"
---

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 4e4f311a0a..5f4aaeaa01 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -504,7 +504,7 @@ class CategoryViewer extends ContextSource {
 		# Split into three columns
 		$columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ );
 
-		$ret = '<table width="100%"><tr valign="top">';
+		$ret = '<table width="100%"><tr style="vertical-align: top;">';
 		$prevchar = null;
 
 		foreach ( $columns as $column ) {
diff --git a/includes/Skin.php b/includes/Skin.php
index 0b0b616995..364d8c5bca 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -835,7 +835,7 @@ abstract class Skin extends ContextSource {
 	 */
 	function logoText( $align = '' ) {
 		if ( $align != '' ) {
-			$a = " align='{$align}'";
+			$a = " style='float: {$align};'";
 		} else {
 			$a = '';
 		}
diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index aa6b22a079..1ae1cb3cce 100644
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -123,18 +123,18 @@ class LegacyTemplate extends BaseTemplate {
 		  "<table border='0' cellspacing='0' width='100%'>\n<tr>\n";
 
 		if ( $this->getSkin()->qbSetting() == 0 ) {
-			$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
+			$s .= "<td class='top' style='text-align: left; vertical-align: top;' rowspan='{$rows}'>\n" .
 				$this->getSkin()->logoText( $wgLang->alignStart() ) . '</td>';
 		}
 
 		$l = $wgLang->alignStart();
-		$s .= "<td {$borderhack} align='$l' valign='top'>\n";
+		$s .= "<td {$borderhack} style='text-align: $l; vertical-align: top;'>\n";
 
 		$s .= $this->topLinks();
 		$s .= '<p class="subtitle">' . $this->pageTitleLinks() . "</p>\n";
 
 		$r = $wgLang->alignEnd();
-		$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
+		$s .= "</td>\n<td {$borderhack} style='text-align: $r; vertical-align: top;' nowrap='nowrap'>";
 		$s .= $this->nameAndLogin();
 		$s .= "\n<br />" . $this->searchForm() . '</td>';
 
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index d9092da863..3846473a59 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -917,7 +917,7 @@ class DifferenceEngine extends ContextSource {
 
 		if ( !$diff && !$otitle ) {
 			$header .= "
-			<tr valign='top'>
+			<tr style='vertical-align: top;'>
 			<td class='diff-ntitle'>{$ntitle}</td>
 			</tr>";
 			$multiColspan = 1;
@@ -935,17 +935,17 @@ class DifferenceEngine extends ContextSource {
 				$multiColspan = 2;
 			}
 			$header .= "
-			<tr valign='top'>
+			<tr style='vertical-align: top;'>
 			<td colspan='$colspan' class='diff-otitle'>{$otitle}</td>
 			<td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>
 			</tr>";
 		}
 
 		if ( $multi != '' ) {
-			$header .= "<tr><td colspan='{$multiColspan}' align='center' class='diff-multi'>{$multi}</td></tr>";
+			$header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;' class='diff-multi'>{$multi}</td></tr>";
 		}
 		if ( $notice != '' ) {
-			$header .= "<tr><td colspan='{$multiColspan}' align='center'>{$notice}</td></tr>";
+			$header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;'>{$notice}</td></tr>";
 		}
 
 		return $header . $diff . "</table>";
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3344436ac3..85365f5dd9 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -667,10 +667,10 @@ class SpecialSearch extends SpecialPage {
 					return "<li>" .
 						'<table class="searchResultImage">' .
 						'<tr>' .
-						'<td width="120" align="center" valign="top">' .
+						'<td width="120" style="text-align: center; vertical-align: top;">' .
 						$thumb->toHtml( array( 'desc-link' => true ) ) .
 						'</td>' .
-						'<td valign="top">' .
+						'<td style="vertical-align: top;">' .
 						$link .
 						$extract .
 						"<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 3a6fab31f4..6dde6b9a58 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -914,10 +914,10 @@ class SpecialUndelete extends SpecialPage {
 			"<col class='diff-marker' />" .
 			"<col class='diff-content' />" .
 			"<tr>" .
-				"<td colspan='2' width='50%' align='center' class='diff-otitle'>" .
+				"<td colspan='2' width='50%' style='text-align: center' class='diff-otitle'>" .
 				$this->diffHeader( $previousRev, 'o' ) .
 				"</td>\n" .
-				"<td colspan='2' width='50%' align='center' class='diff-ntitle'>" .
+				"<td colspan='2' width='50%' style='text-align: center' class='diff-ntitle'>" .
 				$this->diffHeader( $currentRev, 'n' ) .
 				"</td>\n" .
 			"</tr>" .
diff --git a/skins/Standard.php b/skins/Standard.php
index e47b35f388..54613090c4 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -67,7 +67,7 @@ class StandardTemplate extends LegacyTemplate {
 		wfProfileOut( __METHOD__ . '-1' );
 		wfProfileIn( __METHOD__ . '-2' );
 		$l = $this->getSkin()->getLanguage()->alignStart();
-		$s .= "<td class='bottom' align='$l' valign='top'>";
+		$s .= "<td class='bottom' style='text-align: $l; vertical-align: top;'>";
 
 		$s .= $this->bottomLinks();
 		$s .= "\n<br />" . $this->getSkin()->getLanguage()->pipeList( array(