From 5f67d80afd86a4a7d76c6c98f0b3490da25ff179 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 6 Jun 2016 17:22:48 +0200 Subject: [PATCH] HTMLForm: Properly support 'flatlist' in OOUI mode Previously it worked mostly by chance for multiselect fields (until 2f33194497bd94d1cecb21dcb88e9bf3abf2ddaa broke it), and did not work at all for radio fields. Bug: T123935 Change-Id: I94396303bcf16110a505883bec2ce352d833fe2b --- includes/htmlform/HTMLRadioField.php | 1 - includes/specials/SpecialBlockList.php | 2 +- resources/Resources.php | 4 ---- .../src/mediawiki.special/mediawiki.special.blocklist.css | 4 ---- resources/src/mediawiki/mediawiki.htmlform.ooui.css | 6 ++++++ 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 resources/src/mediawiki.special/mediawiki.special.blocklist.css diff --git a/includes/htmlform/HTMLRadioField.php b/includes/htmlform/HTMLRadioField.php index 9d3cc13a12..e5b5e68f20 100644 --- a/includes/htmlform/HTMLRadioField.php +++ b/includes/htmlform/HTMLRadioField.php @@ -52,7 +52,6 @@ class HTMLRadioField extends HTMLFormField { 'id' => $this->mID, 'value' => $value, 'options' => $options, - 'classes' => 'mw-htmlform-flatlist-item', ] + OOUI\Element::configFromHtmlAttributes( $this->getAttributes( [ 'disabled', 'tabindex' ] ) ) ); diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php index dbbee71453..7c7f017b72 100644 --- a/includes/specials/SpecialBlockList.php +++ b/includes/specials/SpecialBlockList.php @@ -46,7 +46,7 @@ class SpecialBlockList extends SpecialPage { $out = $this->getOutput(); $lang = $this->getLanguage(); $out->setPageTitle( $this->msg( 'ipblocklist' ) ); - $out->addModuleStyles( [ 'mediawiki.special', 'mediawiki.special.blocklist' ] ); + $out->addModuleStyles( [ 'mediawiki.special' ] ); $request = $this->getRequest(); $par = $request->getVal( 'ip', $par ); diff --git a/resources/Resources.php b/resources/Resources.php index 831fb0c267..d7bd5ee5f7 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1791,10 +1791,6 @@ return [ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css', 'dependencies' => 'mediawiki.util', ], - 'mediawiki.special.blocklist' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css', - 'position' => 'top', - ], 'mediawiki.special.changeslist' => [ '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 deleted file mode 100644 index b7513b60a5..0000000000 --- a/resources/src/mediawiki.special/mediawiki.special.blocklist.css +++ /dev/null @@ -1,4 +0,0 @@ -.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 diff --git a/resources/src/mediawiki/mediawiki.htmlform.ooui.css b/resources/src/mediawiki/mediawiki.htmlform.ooui.css index 47a662f3a0..5b9d88ca60 100644 --- a/resources/src/mediawiki/mediawiki.htmlform.ooui.css +++ b/resources/src/mediawiki/mediawiki.htmlform.ooui.css @@ -18,3 +18,9 @@ margin-right: 5%; width: 39%; } + +.mw-htmlform-flatlist .oo-ui-optionWidget, +.mw-htmlform-flatlist .oo-ui-multioptionWidget { + display: inline-block; + margin-right: 1em; +} -- 2.20.1