From 5195140ff8e6950fccc95b9bd3239a39aefc822a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 21 Jun 2016 19:50:03 +0100
Subject: [PATCH] reposition Login spinner

---
 src/SdkConfig.js                         | 47 ++++++++++++++++++++++++
 src/components/structures/login/Login.js |  5 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/SdkConfig.js

diff --git a/src/SdkConfig.js b/src/SdkConfig.js
new file mode 100644
index 0000000000..46c2b818b8
--- /dev/null
+++ b/src/SdkConfig.js
@@ -0,0 +1,47 @@
+/*
+Copyright 2016 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.
+*/
+
+var DEFAULTS = {
+    // URL to a page we show in an iframe to configure integrations
+    //integrations_ui_url: "https://scalar.vector.im/",
+    integrations_ui_url: "http://127.0.0.1:5051/",
+    // Base URL to the REST interface of the integrations server
+    //integrations_rest_url: "https://scalar.vector.im/api",
+    integrations_rest_url: "http://127.0.0.1:5050",
+};
+
+class SdkConfig {
+
+    static get() {
+        return global.mxReactSdkConfig;
+    }
+
+    static put(cfg) {
+        var defaultKeys = Object.keys(DEFAULTS);
+        for (var i = 0; i < defaultKeys.length; ++i) {
+            if (cfg[defaultKeys[i]] === undefined) {
+                cfg[defaultKeys[i]] = DEFAULTS[defaultKeys[i]];
+            }
+        }
+        global.mxReactSdkConfig = cfg;
+    }
+
+    static unset() {
+        global.mxReactSdkConfig = undefined;
+    }
+}
+
+module.exports = SdkConfig;
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index aa0c42dc98..a73ad30f87 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -232,7 +232,9 @@ module.exports = React.createClass({displayName: 'Login',
                 <div className="mx_Login_box">
                     <LoginHeader />
                     <div>
-                        <h2>Sign in</h2>
+                        <h2>Sign in
+                            { loader }
+                        </h2>
                         { this.componentForStep(this._getCurrentFlowStep()) }
                         <ServerConfig ref="serverConfig"
                             withToggleButton={true}
@@ -244,7 +246,6 @@ module.exports = React.createClass({displayName: 'Login',
                             onIsUrlChanged={this.onIsUrlChanged}
                             delayTimeMs={1000}/>
                         <div className="mx_Login_error">
-                                { loader }
                                 { this.state.errorText }
                         </div>
                         <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">