Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

change version of node image 8.6; work around for href warnings with button

Browse source
This commit is contained in:
Sonja Happ 2019-07-17 16:33:26 +02:00
parent 897e949737
commit ca5b717056
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/docker/Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:8.2 AS builder
FROM node:8.6 AS builder
RUN apt-get install -y \
git

8
src/components/editable-header.js
View file

@ -21,7 +21,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { FormControl } from 'react-bootstrap';
import { FormControl, Button } from 'react-bootstrap';
import Icon from './icon';
class EditableHeader extends React.Component {
@ -85,8 +85,8 @@ class EditableHeader extends React.Component {
<FormControl type='text' bsSize='large' value={this.state.title} onChange={this.onChange} style={editStyle} autoFocus />
</form>
<a href={'#'} onClick={this.save}><Icon icon='check' style={iconStyle} /></a>
<a href={'#'} onClick={this.cancel}><Icon icon='times' style={iconStyle} /></a>
<Button onClick={this.save}><Icon icon='check' style={iconStyle} /></Button>
<Button onClick={this.cancel}><Icon icon='times' style={iconStyle} /></Button>
</div>;
}
@ -95,7 +95,7 @@ class EditableHeader extends React.Component {
{this.state.title}
</h1>
<a href={'#'} onClick={this.edit}><Icon icon='edit' style={iconStyle} /></a>
<Button onClick={this.edit}><Icon icon='edit' style={iconStyle} /></Button>
</div>;
}
}

2
src/components/table.js
View file

@ -74,7 +74,7 @@ class CustomTable extends Component {
if (linkKey && data[linkKey] != null) {
cell.push(<Link to={child.props.link + data[linkKey]}>{content}</Link>);
} else if (child.props.clickable) {
cell.push(<a href={'#'} onClick={() => child.props.onClick(index)}>{content}</a>);
cell.push(<Button onClick={() => child.props.onClick(index)}>{content}</Button>);
} else {
cell.push(content);
}