From: Glaisher <glaisher.wiki@gmail.com>
Date: Fri, 1 May 2015 17:59:33 +0000 (+0000)
Subject: Revert "Use CSS columns instead of tables in Special:SpecialPages"
X-Git-Tag: 1.31.0-rc.0~9918^2~1
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=25b10c47a4653359387222eea2f3cf850620a070

Revert "Use CSS columns instead of tables in Special:SpecialPages"

This reverts commit dc40debaea2effd46a43c88d0fc925b3550c829b.

Bug: T97026
Change-Id: I1475a61037e6ece536b2b4e26f4d606d5d3828f7
---

diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index c3234e1be6..ed3ad5bf7e 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -96,14 +96,22 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 		$includesCachedPages = false;
 
 		foreach ( $groups as $group => $sortedPages ) {
+			$total = count( $sortedPages );
+			$middle = ceil( $total / 2 );
+			$count = 0;
 
 			$out->wrapWikiMsg(
 				"<h2 class=\"mw-specialpagesgroup\" id=\"mw-specialpagesgroup-$group\">$1</h2>\n",
 				"specialpages-group-$group"
 			);
 			$out->addHTML(
-				Html::openElement( 'div', array( 'class' => 'mw-specialpages-list' ) )
-				. '<ul>'
+				Html::openElement(
+					'table',
+					array( 'style' => 'width:100%;', 'class' => 'mw-specialpages-table' )
+				) . "\n" .
+				Html::openElement( 'tr' ) . "\n" .
+				Html::openElement( 'td', array( 'style' => 'width:30%;vertical-align:top' ) ) . "\n" .
+				Html::openElement( 'ul' ) . "\n"
 			);
 			foreach ( $sortedPages as $desc => $specialpage ) {
 				list( $title, $restricted, $cached ) = $specialpage;
@@ -124,10 +132,21 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 						array( 'class' => implode( ' ', $pageClasses ) ),
 						$link
 					) . "\n" );
+
+				# Split up the larger groups
+				$count++;
+				if ( $total > 3 && $count == $middle ) {
+					$out->addHTML(
+						Html::closeElement( 'ul' ) . Html::closeElement( 'td' ) .
+						Html::element( 'td', array( 'style' => 'width:10%' ), '' ) .
+						Html::openElement( 'td', array( 'style' => 'width:30%' ) ) . Html::openElement( 'ul' ) . "\n"
+					);
+				}
 			}
 			$out->addHTML(
-				Html::closeElement( 'ul' ) .
-				Html::closeElement( 'div' )
+				Html::closeElement( 'ul' ) . Html::closeElement( 'td' ) .
+				Html::element( 'td', array( 'style' => 'width:30%' ), '' ) .
+				Html::closeElement( 'tr' ) . Html::closeElement( 'table' ) . "\n"
 			);
 		}
 
diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css
index a13ec3cc40..d245726222 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -84,10 +84,13 @@ td#mw-prefixindex-nav-form {
 	font-weight: bold;
 }
 
-.mw-specialpages-list {
-	-webkit-columns: 16em 2;
-	-moz-columns: 16em 2;
-	columns: 16em 2;
+.mw-specialpages-table {
+	margin-top: -1em;
+	margin-bottom: 1em;
+}
+
+.mw-specialpages-table td {
+	vertical-align: top;
 }
 
 /* Special:Statistics */