From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Mon, 27 Jul 2015 20:37:37 +0000 (+0200)
Subject: Use OOUI on Special:BlockList
X-Git-Tag: 1.31.0-rc.0~8484
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=51cce7a83effdf8b8ca7e079d36513ab28809ce9;p=lhc%2Fweb%2Fwiklou.git

Use OOUI on Special:BlockList

Switch to OOUI HtmlForm and replace mediawiki.userSuggest with
OOUI HtmlForm type user.

Bug: T117734
Change-Id: I37d9acbdd272c0cc2f2e120aada2e9fcea215509
---

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index d4a293eb63..3d9ec1f51f 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -1054,8 +1054,8 @@ abstract class HTMLFormField {
 
 		foreach ( $oldoptions as $text => $data ) {
 			$options[] = array(
-				'data' => $data,
-				'label' => $text,
+				'data' => (string)$data,
+				'label' => (string)$text,
 			);
 		}
 
diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 9defaba7f1..73a2774d73 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -46,8 +46,7 @@ class SpecialBlockList extends SpecialPage {
 		$out = $this->getOutput();
 		$lang = $this->getLanguage();
 		$out->setPageTitle( $this->msg( 'ipblocklist' ) );
-		$out->addModuleStyles( 'mediawiki.special' );
-		$out->addModules( 'mediawiki.userSuggest' );
+		$out->addModuleStyles( array( 'mediawiki.special', 'mediawiki.special.blocklist' ) );
 
 		$request = $this->getRequest();
 		$par = $request->getVal( 'ip', $par );
@@ -71,12 +70,11 @@ class SpecialBlockList extends SpecialPage {
 		# Just show the block list
 		$fields = array(
 			'Target' => array(
-				'type' => 'text',
+				'type' => 'user',
 				'label-message' => 'ipaddressorusername',
 				'tabindex' => '1',
 				'size' => '45',
 				'default' => $this->target,
-				'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
 			),
 			'Options' => array(
 				'type' => 'multiselect',
@@ -104,7 +102,7 @@ class SpecialBlockList extends SpecialPage {
 		);
 		$context = new DerivativeContext( $this->getContext() );
 		$context->setTitle( $this->getPageTitle() ); // Remove subpage
-		$form = new HTMLForm( $fields, $context );
+		$form = HTMLForm::factory( 'ooui', $fields, $context );
 		$form->setMethod( 'get' );
 		$form->setWrapperLegendMsg( 'ipblocklist-legend' );
 		$form->setSubmitTextMsg( 'ipblocklist-submit' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 8dd78abe5f..987b97a6de 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1694,6 +1694,10 @@ return array(
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
 		'dependencies' => 'mediawiki.util',
 	),
+	'mediawiki.special.blocklist' => array(
+		'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css',
+		'position' => 'top',
+	),
 	'mediawiki.special.changeslist' => array(
 		'position' => 'top',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
diff --git a/resources/src/mediawiki.special/mediawiki.special.blocklist.css b/resources/src/mediawiki.special/mediawiki.special.blocklist.css
new file mode 100644
index 0000000000..b7513b60a5
--- /dev/null
+++ b/resources/src/mediawiki.special/mediawiki.special.blocklist.css
@@ -0,0 +1,4 @@
+.mw-htmlform-flatlist-item {
+	/* FIXME: There should be an option in OOUI to do that */
+	display: inline-block !important;
+}
\ No newline at end of file