gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix up some of the modals

This commit is contained in:
Matthew Hodgson 2015-07-21 17:02:06 -07:00
parent ceb214f192
commit 67d3368e1e
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skins/base/css/common.css
View File

@ -86,14 +86,16 @@ html {
.mx_Dialog button {
border: 0px;
width: 80px;
height: 36px;
line-height: 36px;
border-radius: 36px;
font-weight: 400;
font-size: 16px;
color: #fff;
background-color: #80cef4;
margin-left: 8px;
margin-right: 8px;
padding-left: 1em;
padding-right: 1em;
}
.mx_ErrorDialogTitle {

8
skins/base/views/molecules/ChangeAvatar.js
View File

@ -43,11 +43,15 @@ module.exports = React.createClass({
case this.Phases.Error:
return (
<div>
<img src={this.state.avatarUrl} />
<div>
<div className="mx_Dialog_content">
<img src={this.state.avatarUrl}/>
</div>
<div className="mx_Dialog_content">
Upload new:
<input type="file" onChange={this.onFileSelected}/>
{this.state.errorText}
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished}>Cancel</button>
</div>
</div>

24
skins/base/views/molecules/ChangePassword.js
View File

@ -51,11 +51,13 @@ module.exports = React.createClass({
case this.Phases.Error:
return (
<div>
<div>{this.state.errorString}</div>
<label>Old password <input type="password" ref="old_input"/></label>
<label>New password <input type="password" ref="new_input"/></label>
<label>Confirm password <input type="password" ref="confirm_input"/></label>
<div>
<div className="mx_Dialog_content">
<div>{this.state.errorString}</div>
<div><label>Old password <input type="password" ref="old_input"/></label></div>
<div><label>New password <input type="password" ref="new_input"/></label></div>
<div><label>Confirm password <input type="password" ref="confirm_input"/></label></div>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.onClickChange}>Change Password</button>
<button onClick={this.props.onFinished}>Cancel</button>
</div>
@ -63,13 +65,19 @@ module.exports = React.createClass({
);
case this.Phases.Uploading:
return (
<Loader />
<div className="mx_Dialog_content">
<Loader />
</div>
);
case this.Phases.Success:
return (
<div>
Success!
<button onClick={this.props.onFinished}>Ok</button>
<div className="mx_Dialog_content">
Success!
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished}>Ok</button>
</div>
</div>
)
}

12
skins/base/views/organisms/LogoutPrompt.js
View File

@ -26,10 +26,14 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_LogoutPrompt">
Sign out?<br />
<button onClick={this.logOut}>Sign Out</button>
<button onClick={this.cancelPrompt}>Cancel</button>
<div>
<div className="mx_Dialog_content">
Sign out?
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.logOut}>Sign Out</button>
<button onClick={this.cancelPrompt}>Cancel</button>
</div>
</div>
);
},

1
skins/base/views/organisms/RoomView.js
View File

@ -21,7 +21,6 @@ var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var ComponentBroker = require('../../../../src/ComponentBroker');
var Modal = require("../../../../src/Modal");
var classNames = require("classnames");
var filesize = require('filesize');
var q = require('q');