Merge branch 'master' into vector

skins/base/views/organisms/RoomView.js

@@ -37,6 +37,12 @@ module.exports = React.createClass({
     mixins: [RoomViewController],
 
     render: function() {
+        if (!this.state.room) {
+            return (
+                <div />
+            );
+        }
+
         var myUserId = MatrixClientPeg.get().credentials.userId;
         if (this.state.room.currentState.members[myUserId].membership == 'invite') {
             if (this.state.joining) {

skins/base/views/pages/MatrixChat.js

@@ -23,6 +23,7 @@ var LeftPanel = ComponentBroker.get('organisms/LeftPanel');
 var RoomView = ComponentBroker.get('organisms/RoomView');
 var RightPanel = ComponentBroker.get('organisms/RightPanel');
 var Login = ComponentBroker.get('templates/Login');
+var Register = ComponentBroker.get('templates/Register');
 
 var MatrixChatController = require("../../../../src/controllers/pages/MatrixChat");
 
@@ -47,6 +48,14 @@ module.exports = React.createClass({
             return (
                 <Loader />
             );
+        } else if (this.state.screen == 'register') {
+            return (
+                <Register onLoggedIn={this.onLoggedIn} clientSecret={this.state.register_client_secret}
+                    sessionId={this.state.register_session_id} idSid={this.state.register_id_sid}
+                    hsUrl={this.state.register_hs_url} isUrl={this.state.register_is_url}
+                    registrationUrl={this.props.registrationUrl}
+                />
+            );
         } else {
             return (
                 <Login onLoggedIn={this.onLoggedIn} />

skins/base/views/templates/Login.js

@@ -40,6 +40,7 @@ module.exports = React.createClass({
                     <h1>Please log in:</h1>
                     {this.componentForStep(this.state.step)}
                     <div className="error">{this.state.errorText}</div>
+                    <a onClick={this.showRegister} href="#">Create a new account</a>
                 </div>
             );
         }

skins/base/views/templates/Register.js

@@ -0,0 +1,55 @@
+/*
+Copyright 2015 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+var React = require('react');
+
+var ComponentBroker = require("../../../../src/ComponentBroker");
+
+var Loader = require("react-loader");
+
+var RegisterController = require("../../../../src/controllers/templates/Register");
+
+module.exports = React.createClass({
+    displayName: 'Register',
+    mixins: [RegisterController],
+
+    registerContent: function() {
+        if (this.state.busy) {
+            return (
+                <Loader />
+            );
+        } else {
+            return (
+                <div>
+                    <h1>Create a new account:</h1>
+                    {this.componentForStep(this.state.step)}
+                    <div className="error">{this.state.errorText}</div>
+                    <a onClick={this.showLogin} href="#">Sign in with existing account</a>
+                </div>
+            );
+        }
+    },
+
+    render: function() {
+        return (
+            <div className="mx_Register">
+            {this.registerContent()}
+            </div>
+        );
+    }
+});