Commit d40d5b29 authored by Laura Fuentes Grau's avatar Laura Fuentes Grau

Merge branch 'example-dashboard' of git.rwth-aachen.de:acs/public/villas/web into example-dashboard

parents 9516ced5 251aec38
...@@ -40,20 +40,17 @@ class DashboardButtonGroup extends React.Component { ...@@ -40,20 +40,17 @@ class DashboardButtonGroup extends React.Component {
if (this.props.editing) { if (this.props.editing) {
buttons.push( buttons.push(
<Button key={key++} onClick={this.props.onSave} style={buttonStyle}> <Button key={key++} onClick={this.props.onSave} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="save" /> Save
<span className="glyphicon glyphicon-floppy-disk"></span> Save
</Button>, </Button>,
<Button key={key++} onClick={this.props.onCancel} style={buttonStyle}> <Button key={key++} onClick={this.props.onCancel} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="times" /> Cancel
<span className="glyphicon glyphicon-remove" ></span> Cancel
</Button> </Button>
); );
} else { } else {
if (this.props.fullscreen !== true) { if (this.props.fullscreen !== true) {
buttons.push( buttons.push(
<Button key={key++} onClick={this.props.onFullscreen} style={buttonStyle}> <Button key={key++} onClick={this.props.onFullscreen} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="expand" /> Fullscreen
<span className="glyphicon glyphicon-resize-full"></span> Fullscreen
</Button> </Button>
); );
} }
...@@ -61,23 +58,20 @@ class DashboardButtonGroup extends React.Component { ...@@ -61,23 +58,20 @@ class DashboardButtonGroup extends React.Component {
if (this.props.paused) { if (this.props.paused) {
buttons.push( buttons.push(
<Button key={key++} onClick={this.props.onUnpause} style={buttonStyle}> <Button key={key++} onClick={this.props.onUnpause} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="play" /> Live
<span className="glyphicon glyphicon-play"></span> Live
</Button> </Button>
); );
} else { } else {
buttons.push( buttons.push(
<Button key={key++} onClick={this.props.onPause} style={buttonStyle}> <Button key={key++} onClick={this.props.onPause} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="pause" /> Pause
<span className="glyphicon glyphicon-pause"></span> Pause
</Button> </Button>
); );
} }
buttons.push( buttons.push(
<Button key={key++} onClick={this.props.onEdit} style={buttonStyle}> <Button key={key++} onClick={this.props.onEdit} style={buttonStyle}>
<Icon icon="info" /> <Icon icon="pen" /> Edit
<span className="glyphicon glyphicon-pencil"></span> Edit
</Button> </Button>
); );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment