Moving ControlLabelWithTooltip where it belongs

superset/assets/javascripts/explorev2/components/CheckboxField.jsx

 import React, { PropTypes } from 'react';
 import { Checkbox } from 'react-bootstrap';
-import ControlLabelWithTooltip from './ControlLabelWithTooltip';
 
 const propTypes = {
   name: PropTypes.string.isRequired,
@@ -27,9 +26,7 @@ export default class CheckboxField extends React.Component {
         inline
         checked={this.props.value}
         onChange={this.onToggle.bind(this)}
-      >
-        <ControlLabelWithTooltip label={this.props.label} description={this.props.description} />
-      </Checkbox>
+      />
     );
   }
 }

superset/assets/javascripts/explorev2/components/FieldSet.jsx

@@ -4,6 +4,8 @@ import CheckboxField from './CheckboxField';
 import TextAreaField from './TextAreaField';
 import SelectField from './SelectField';
 
+import ControlLabelWithTooltip from './ControlLabelWithTooltip';
+
 const fieldMap = {
   TextField,
   CheckboxField,
@@ -38,6 +40,7 @@ export default class FieldSet extends React.Component {
     const FieldClass = fieldMap[this.props.type];
     return (
       <div>
+        <ControlLabelWithTooltip label={this.props.label} description={this.props.description} />
         <FieldClass {...this.props} />
       </div>
     );

superset/assets/javascripts/explorev2/components/SelectField.jsx

 import React, { PropTypes } from 'react';
-import ControlLabelWithTooltip from './ControlLabelWithTooltip';
 import { slugify } from '../../modules/utils';
 import Select, { Creatable } from 'react-select';
 
@@ -99,7 +98,7 @@ export default class SelectField extends React.Component {
       );
     }
     return (
-      <div>
+      <div id={`formControlsSelect-${slugify(this.props.label)}`}>
         {selectWrap}
       </div>
     );

superset/assets/javascripts/explorev2/components/TextAreaField.jsx

 import React, { PropTypes } from 'react';
 import { FormGroup, FormControl } from 'react-bootstrap';
-import ControlLabelWithTooltip from './ControlLabelWithTooltip';
 
 const propTypes = {
   name: PropTypes.string.isRequired,
@@ -24,7 +23,6 @@ export default class TextAreaField extends React.Component {
   render() {
     return (
       <FormGroup controlId="formControlsTextarea">
-        <ControlLabelWithTooltip label={this.props.label} description={this.props.description} />
         <FormControl
           componentClass="textarea"
           placeholder="textarea"

superset/assets/javascripts/explorev2/components/TextField.jsx

 import React, { PropTypes } from 'react';
 import { FormGroup, FormControl } from 'react-bootstrap';
-import ControlLabelWithTooltip from './ControlLabelWithTooltip';
 
 const propTypes = {
   name: PropTypes.string.isRequired,
@@ -24,10 +23,6 @@ export default class TextField extends React.Component {
   render() {
     return (
       <FormGroup controlId="formInlineName" bsSize="small">
-        <ControlLabelWithTooltip
-          label={this.props.label}
-          description={this.props.description}
-        />
         <FormControl
           type="text"
           placeholder=""

superset/assets/javascripts/explorev2/main.css

@@ -19,3 +19,9 @@
   padding: 0 0 0 .5em;
   font-size: 14px;
 }
+
+.checkbox {
+    float: left;
+    margin-top: 0px;
+    margin-right: 3px;
+}