diff --git a/src/common/table.js b/src/common/table.js index d68191a..87a52be 100644 --- a/src/common/table.js +++ b/src/common/table.js @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import _ from 'lodash'; -import { Table, Button, FormControl, FormLabel, FormCheck } from 'react-bootstrap'; +import { Table, Button, FormControl, FormLabel, FormCheck, Tooltip, OverlayTrigger } from 'react-bootstrap'; import { Link } from 'react-router-dom'; import Icon from './icon'; @@ -103,11 +103,13 @@ class CustomTable extends Component { // add buttons if (child.props.editButton) { - cell.push( child.props.onEdit(index)} disabled={child.props.onEdit == null}>); + cell.push( Edit } > + child.props.onEdit(index)} disabled={child.props.onEdit == null}>); } if (child.props.deleteButton) { - cell.push( child.props.onDelete(index)} disabled={child.props.onDelete == null}>); + cell.push( Delete } > + child.props.onDelete(index)} disabled={child.props.onDelete == null}>); } if (child.props.checkbox) { @@ -117,7 +119,8 @@ class CustomTable extends Component { } if (child.props.exportButton) { - cell.push( child.props.onExport(index)} disabled={child.props.onExport == null}>); + cell.push( Export } > + child.props.onExport(index)} disabled={child.props.onExport == null}>); } return cell; diff --git a/src/dashboard/dashboard-button-group.js b/src/dashboard/dashboard-button-group.js index 8baeece..b18e5b3 100644 --- a/src/dashboard/dashboard-button-group.js +++ b/src/dashboard/dashboard-button-group.js @@ -17,13 +17,13 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Button } from 'react-bootstrap'; +import { Button,OverlayTrigger, Tooltip } from 'react-bootstrap'; import Icon from "../common/icon"; class DashboardButtonGroup extends React.Component { render() { const buttonStyle = { - marginLeft: '8px' + marginLeft: '12px', }; const buttons = []; @@ -35,46 +35,60 @@ class DashboardButtonGroup extends React.Component { if (this.props.editing) { buttons.push( - - Save - , - - Cancel + Save changes } > + + + , + Discard changes } > + + + + ); } else { if (this.props.fullscreen !== true) { buttons.push( - - Fullscreen + Change to fullscreen view } > + + + ); } if (this.props.paused) { buttons.push( - - Live + Continue simulation } > + + + ); } else { buttons.push( - - Pause + Pause simulation } > + + + ); } buttons.push( - - Edit Files + Add, edit or delete files of scenario } > + + + ); buttons.push( - - Edit Layout + Add widgets and edit layout } > + + + ); } diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js index 05f69e1..e45d6aa 100644 --- a/src/dashboard/dashboard.js +++ b/src/dashboard/dashboard.js @@ -240,7 +240,6 @@ class Dashboard extends Component { closeEditFiles(){ this.setState({ filesEditModal: false }); - // TODO do we need this if the dispatches happen in the dialog? } closeEdit(data){ diff --git a/src/widget/toolbox-item.js b/src/widget/toolbox-item.js index b61bdc4..4703aee 100644 --- a/src/widget/toolbox-item.js +++ b/src/widget/toolbox-item.js @@ -51,7 +51,7 @@ class ToolboxItem extends React.Component { if (this.props.disabled === false) { return this.props.connectDragSource( - + {this.props.icon && } {this.props.name} diff --git a/src/widget/widget-toolbox.js b/src/widget/widget-toolbox.js index 18912f1..b2fb527 100644 --- a/src/widget/widget-toolbox.js +++ b/src/widget/widget-toolbox.js @@ -54,6 +54,11 @@ class WidgetToolbox extends React.Component { + Drag and drop widgets onto the dashboard } > + + + + @@ -65,12 +70,12 @@ class WidgetToolbox extends React.Component { Increase dashboard height } > - this.props.onDashboardSizeChange(1)} > + this.props.onDashboardSizeChange(1)} > Decrease dashboard height } > - this.props.onDashboardSizeChange(-1)} > + this.props.onDashboardSizeChange(-1)} >