Use LoginHeader everywhere

This commit is contained in:
Kegan Dougal 2015-12-01 16:29:58 +00:00
parent 05a6121934
commit 673b01267a
4 changed files with 6 additions and 8 deletions

View file

@ -44,7 +44,7 @@ var INITIAL_SIZE = 20;
module.exports = React.createClass({
displayName: 'RoomView',
propTypes: {
ConferenceHandler: React.PropTypes.any // VectorConferenceHandler
ConferenceHandler: React.PropTypes.any
},
getInitialState: function() {

View file

@ -58,12 +58,11 @@ module.exports = React.createClass({
render: function() {
var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
var LoginHeader = sdk.getComponent('login.LoginHeader');
return (
<div className="mx_Login">
<div className="mx_Login_box">
<div className="mx_Login_logo">
<img src="img/logo.png" width="249" height="78" alt="vector"/>
</div>
<LoginHeader />
<div className="mx_Login_profile">
Set a display name:
<ChangeDisplayName />

View file

@ -234,12 +234,11 @@ module.exports = React.createClass({
},
render: function() {
var LoginHeader = sdk.getComponent('login.LoginHeader');
return (
<div className="mx_Login">
<div className="mx_Login_box">
<div className="mx_Login_logo">
<img src="img/logo.png" width="249" height="78" alt="vector"/>
</div>
<LoginHeader />
{this._getRegisterContentJsx()}
</div>
</div>

View file

@ -29,7 +29,7 @@ module.exports = React.createClass({
displayName: 'RoomList',
propTypes: {
ConferenceHandler: React.PropTypes.any, // e.g. VectorConferenceHandler
ConferenceHandler: React.PropTypes.any,
collapsed: React.PropTypes.bool,
currentRoom: React.PropTypes.string
},