aclindsa/moneygo
1
0
Fork 0
mirror of https://github.com/aclindsa/moneygo.git synced 2024-12-27 07:52:28 -05:00
Code Issues Releases Wiki Activity

Finish update for latest React, Bootstrap, jQuery versions

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

6
static/index.html
View File

@ -2,12 +2,12 @@
<head> <head>
<title>MoneyGo</title> <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.7/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-theme.min.css">
<link rel="stylesheet" href="static/react-widgets/css/react-widgets.css"> <link rel="stylesheet" href="static/react-widgets/css/react-widgets.css">
<link rel="stylesheet" href="static/stylesheet.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> <script type="text/javascript" src="static/bundle.js"></script>