mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

implement login

Browse source
This commit is contained in:
Matthew Hodgson 2015-07-19 03:19:37 +01:00
parent 1e1f7492d8
commit d239070adb
6 changed files with 139 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
skins/base/views/molecules/ServerConfig.js
View file

@ -26,17 +26,12 @@ module.exports = React.createClass({
render: function() {
return (
<div className="HomeServerTextBox">
<table className="serverConfig">
<tr>
<td>Home Server URL</td>
<td><input type="text" value={this.state.hs_url} onChange={this.hsChanged} /></td>
</tr>
<tr>
<td>Identity Server URL</td>
<td><input type="text" value={this.state.is_url} onChange={this.isChanged} /></td>
</tr>
</table>
<div className="mx_ServerConfig">
<label className="mx_Login_label mx_ServerConfig_hslabel" htmlFor="hsurl">Home server URL</label>
<input className="mx_Login_field" id="hsurl" type="text" value={this.state.hs_url} onChange={this.hsChanged} />
<label className="mx_Login_label mx_ServerConfig_islabel" htmlFor="isurl">Identity server URL</label>
<input className="mx_Login_field" type="text" value={this.state.is_url} onChange={this.isChanged} />
<a className="mx_ServerConfig_help" href="#">What does this mean?</a>
</div>
);
}

31
skins/base/views/templates/Login.js
View file

@ -111,13 +111,13 @@ module.exports = React.createClass({
}
return (
<div>
<input type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
Use custom server options (advanced)
<input className="mx_Login_advanced_checkbox" id="advanced" type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
<label className="mx_Login_label" htmlFor="advanced">Use custom server options (advanced)</label>
<div style={serverConfigStyle}>
<ServerConfig ref="serverConfig"
defaultHsUrl={this.customHsUrl} defaultIsUrl={this.customIsUrl}
onHsUrlChanged={this.onHsUrlChanged}
/>
<ServerConfig ref="serverConfig"
defaultHsUrl={this.customHsUrl} defaultIsUrl={this.customIsUrl}
onHsUrlChanged={this.onHsUrlChanged}
/>
</div>
</div>
);
@ -126,10 +126,10 @@ module.exports = React.createClass({
return (
<div>
<form onSubmit={this.onUserPassEntered}>
<input ref="user" type="text" placeholder="username" /><br />
<input ref="pass" type="password" placeholder="password" /><br />
<input className="mx_Login_field" ref="user" type="text" placeholder="Email or user name" /><br />
<input className="mx_Login_field" ref="pass" type="password" placeholder="Password" /><br />
{this.componentForStep('choose_hs')}
<input type="submit" value="Log in" />
<input className="mx_Login_submit" type="submit" value="Log in" />
</form>
</div>
);
@ -144,10 +144,10 @@ module.exports = React.createClass({
} else {
return (
<div>
<h1>Please log in:</h1>
<h2>Sign in</h2>
{this.componentForStep(this.state.step)}
<div className="error">{this.state.errorText}</div>
<a onClick={this.showRegister} href="#">Create a new account</a>
<div className="mx_Login_error">{this.state.errorText}</div>
<a className="mx_Login_create" onClick={this.showRegister} href="#">Create a new account</a>
</div>
);
}
@ -156,7 +156,12 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_Login">
{this.loginContent()}
<div className="mx_Login_box">
<div className="mx_Login_logo">
<img src="/img/logo.png" width="249" height="76" alt="vector"/>
</div>
{this.loginContent()}
</div>
</div>
);
}

11
skins/base/views/templates/Register.js
View file

@ -129,7 +129,7 @@ module.exports = React.createClass({
case 'stage_m.login.recaptcha':
return (
<div ref="recaptchaContainer">
This Home Server would like to make sure you're not a robot
This Home Server would like to make sure you are not a robot
<div id="mx_recaptcha"></div>
</div>
);
@ -180,8 +180,13 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_Register">
{this.registerContent()}
<div className="mx_Login">
<div className="mx_Login_box">
<div className="mx_Login_logo">
<img src="/img/logo.png" width="249" height="76" alt="vector"/>
</div>
{this.registerContent()}
</div>
</div>
);
}