aclindsa
/
moneygo
mirror of https://github.com/aclindsa/moneygo.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Finish update for latest React, Bootstrap, jQuery versions

This commit is contained in:
Aaron Lindsay 2016-09-27 11:57:35 -04:00
parent 5ff45cd4b4
commit f663ec6afc
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/AccountsTab.js
View File

@ -8,6 +8,7 @@ var Col = ReactBootstrap.Col;
var Form = ReactBootstrap.Form;
var FormGroup = ReactBootstrap.FormGroup;
var FormControl = ReactBootstrap.FormControl;
var Checkbox = ReactBootstrap.Checkbox;
var ControlLabel = ReactBootstrap.ControlLabel;
var Button = ReactBootstrap.Button;
var ButtonGroup = ReactBootstrap.ButtonGroup;
@ -212,12 +213,15 @@ const DeleteAccountModal = React.createClass({
parentAccount = "and any child accounts will be re-parented to: " + this.props.account_map[parentAccountId].Name;
var warningString = "I understand that deleting this account cannot be undone and that all transactions " + parentAccount;
checkbox = (<FormGroup>
<FormControl
type='checkbox'
checkbox = (
<FormGroup>
<Col xsOffset={2} sm={10}>
<Checkbox
checked={this.state.checked ? "checked" : ""}
onClick={this.handleCheckboxClick}/>
<ControlLabel>{warningString}</ControlLabel>
onClick={this.handleCheckboxClick}>
{warningString}
</Checkbox>
</Col>
</FormGroup>);
}
var warning = [];
@ -229,9 +233,9 @@ const DeleteAccountModal = React.createClass({
return (
<Modal
show={this.props.show}
onHide={this.handleCancel}
ref="modal">
show={this.props.show}
onHide={this.handleCancel}
ref="modal">
<Modal.Header closeButton>
<Modal.Title>Delete Account</Modal.Title>
</Modal.Header>
@ -239,15 +243,17 @@ const DeleteAccountModal = React.createClass({
{warning}
<Form horizontal onSubmit={this.handleSubmit}>
<FormGroup>
<ControlLabel>Delete Account</ControlLabel>
<AccountCombobox
includeRoot={false}
accounts={this.props.accounts}
account_map={this.props.account_map}
value={this.state.accountid}
onChange={this.handleChange}/>
{checkbox}
<Col componentClass={ControlLabel} xs={2}>Delete Account</Col>
<Col xs={10}>
<AccountCombobox
includeRoot={false}
accounts={this.props.accounts}
account_map={this.props.account_map}
value={this.state.accountid}
onChange={this.handleChange}/>
</Col>
</FormGroup>
{checkbox}
</Form>
</Modal.Body>
<Modal.Footer>

6
static/index.html
View File

@ -2,12 +2,12 @@
<head>
<title>MoneyGo</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="static/react-widgets/css/react-widgets.css">
<link rel="stylesheet" href="static/stylesheet.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.js"></script>
<script type="text/javascript" src="static/bundle.js"></script>