Merge remote-tracking branch 'origin/develop' into develop

src/components/views/auth/VectorAuthHeaderLogo.js

@@ -19,23 +19,26 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+export default class VectorAuthHeaderLogo extends React.PureComponent {
+    static replaces = 'AuthHeaderLogo'
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthHeaderLogo',
-    statics: {
-        replaces: 'AuthHeaderLogo',
-    },
-    propTypes: {
+    static propTypes = {
         icon: PropTypes.string,
-    },
+    }
+
+    render() {
+        const brandingConfig = SdkConfig.get().branding;
+        let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+            logoUrl = brandingConfig.authHeaderLogoUrl;
+        }
 
-    render: function() {
         return (
             <div className="mx_AuthHeaderLogo">
-                <img src={LOGO_URI} alt="Riot" />
+                <img src={logoUrl} alt="Riot" />
             </div>
         );
-    },
-});
+    }
+}

src/components/views/auth/VectorAuthPage.js

@@ -16,21 +16,24 @@ limitations under the License.
 
 'use strict';
 
-const React = require('react');
+import React from 'react';
 import sdk from 'matrix-react-sdk/lib/index';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthPage',
+export default class VectorAuthPage extends React.PureComponent {
+    static replaces = 'AuthPage'
 
-    statics: {
-        replaces: 'AuthPage',
-    },
-
-    render: function() {
+    render() {
         const AuthFooter = sdk.getComponent('auth.AuthFooter');
 
+        const brandingConfig = SdkConfig.get().branding;
+        let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
+        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
+            backgroundUrl = brandingConfig.welcomeBackgroundUrl;
+        }
+
         const pageStyle = {
-            background: 'center/cover fixed url(themes/riot/img/backgrounds/valley.jpg)',
+            background: `center/cover fixed url(${backgroundUrl})`,
         };
 
         const modalStyle = {
@@ -66,5 +69,5 @@ module.exports = React.createClass({
                 <AuthFooter />
             </div>
         );
-    },
-});
+    }
+}