Merge "Add blanket support for mediawiki ui via globals"

diff --combined includes/htmlform/HTMLForm.php
index ed9e7fe,885bcd7..6501890
--- 1/includes/htmlform/HTMLForm.php
--- 2/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@@ -107,7 -107,6 +107,7 @@@ class HTMLForm extends ContextSource 
                'select' => 'HTMLSelectField',
                'radio' => 'HTMLRadioField',
                'multiselect' => 'HTMLMultiSelectField',
 +              'limitselect' => 'HTMLSelectLimitField',
                'check' => 'HTMLCheckField',
                'toggle' => 'HTMLCheckField',
                'int' => 'HTMLIntField',
@@@ -300,7 -299,12 +300,12 @@@
         * @return string
         */
        public function getDisplayFormat() {
-               return $this->displayFormat;
+               global $wgHTMLFormAllowTableFormat;
+               $format = $this->displayFormat;
+               if ( !$wgHTMLFormAllowTableFormat && $format === 'table' ) {
+                       $format = 'div';
+               }
+               return $format;
        }
  
        /**
@@@ -869,6 -873,7 +874,7 @@@
         * @return string HTML.
         */
        function getButtons() {
+               global $wgUseMediaWikiUIEverywhere;
                $buttons = '';
  
                if ( $this->mShowSubmit ) {
@@@ -888,15 -893,17 +894,17 @@@
  
                        $attribs['class'] = array( 'mw-htmlform-submit' );
  
+                       if ( $this->isVForm() || $wgUseMediaWikiUIEverywhere ) {
+                               array_push( $attribs['class'], 'mw-ui-button', 'mw-ui-constructive' );
+                       }
+ 
                        if ( $this->isVForm() ) {
                                // mw-ui-block is necessary because the buttons aren't necessarily in an
                                // immediate child div of the vform.
                                // @todo Let client specify if the primary submit button is progressive or destructive
                                array_push(
                                        $attribs['class'],
-                                       'mw-ui-button',
                                        'mw-ui-big',
-                                       'mw-ui-constructive',
                                        'mw-ui-block'
                                );
                        }
@@@ -929,6 -936,14 +937,14 @@@
                                $attrs['id'] = $button['id'];
                        }
  
+                       if ( $wgUseMediaWikiUIEverywhere ) {
+                               if ( isset( $attrs['class' ] ) ) {
+                                       $attrs['class'] .= ' mw-ui-button';
+                               } else {
+                                       $attrs['class'] = 'mw-ui-button';
+                               }
+                       }
+ 
                        $buttons .= Html::element( 'input', $attrs ) . "\n";
                }
  
@@@ -1246,6 -1261,9 +1262,9 @@@
                                // Close enough to a div.
                                $getFieldHtmlMethod = 'getDiv';
                                break;
+                       case 'div':
+                               $getFieldHtmlMethod = 'getDiv';
+                               break;
                        default:
                                $getFieldHtmlMethod = 'get' . ucfirst( $displayFormat );
                }