Follow-up r83907: abstract the flatlist mode into a descriptor option, and make it...

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 377783b..58c8bbf 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1403,6 +1403,14 @@ class HTMLSelectOrOtherField extends HTMLTextField {
  * Multi-select field
  */
 class HTMLMultiSelectField extends HTMLFormField {
+
+       public function __construct( $params ){
+               parent::__construct( $params );
+               if( isset( $params['flatlist'] ) ){
+                       $this->mClass .= ' mw-htmlform-multiselect-flatlist';
+               }
+       }
+
        function validate( $value, $alldata ) {
                $p = parent::validate( $value, $alldata );
 
@@ -1454,7 +1462,7 @@ class HTMLMultiSelectField extends HTMLFormField {
                                        $attribs + $thisAttribs );
                                $checkbox .= ' ' . Html::rawElement( 'label', array( 'for' => "{$this->mID}-$info" ), $label );
 
-                               $html .= Html::rawElement( 'div', array( 'class' => 'mw-htmlform-multiselect-item' ), $checkbox );
+                               $html .= ' ' . Html::rawElement( 'div', array( 'class' => 'mw-htmlform-multiselect-item' ), $checkbox );
                        }
                }
 

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 79cb97b..64245ba 100644 (file)
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -76,7 +76,7 @@ class SpecialBlockList extends SpecialPage {
                                        wfMsg( 'blocklist-tempblocks' ) => 'tempblocks',
                                        wfMsg( 'blocklist-addressblocks' ) => 'addressblocks',
                                ),
-                               'cssclass' => 'mw-htmlform-multiselect-flatlist',
+                               'flatlist' => true,
                        ),
                );
                $form = new HTMLForm( $fields );

diff --git a/skins/common/shared.css b/skins/common/shared.css
index e54fe3a..9a8a1b5 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -129,6 +129,7 @@ tr.mw-htmlform-vertical-label td.mw-label {
 .mw-htmlform-multiselect-flatlist div.mw-htmlform-multiselect-item {
        display: inline;
        margin-right: 1em;
+       white-space: nowrap;
 }
 
 input#wpSummary {