Add language selector to bottom of welcome

pull/21833/head
J. Ryan Stinnett 2019-02-08 11:39:30 +00:00
parent 1cf311da10
commit 7238c713d7
3 changed files with 34 additions and 3 deletions

View File

@ -34,6 +34,7 @@
@import "./views/auth/_LanguageSelector.scss"; @import "./views/auth/_LanguageSelector.scss";
@import "./views/auth/_ServerConfig.scss"; @import "./views/auth/_ServerConfig.scss";
@import "./views/auth/_ServerTypeSelector.scss"; @import "./views/auth/_ServerTypeSelector.scss";
@import "./views/auth/_Welcome.scss";
@import "./views/avatars/_BaseAvatar.scss"; @import "./views/avatars/_BaseAvatar.scss";
@import "./views/avatars/_MemberStatusMessageAvatar.scss"; @import "./views/avatars/_MemberStatusMessageAvatar.scss";
@import "./views/context_menus/_MessageContextMenu.scss"; @import "./views/context_menus/_MessageContextMenu.scss";

View File

@ -0,0 +1,26 @@
/*
Copyright 2019 New Vector 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.
*/
.mx_Welcome {
display: flex;
flex-direction: column;
align-items: center;
}
.mx_Welcome .mx_AuthBody_language {
width: 120px;
margin-bottom: 10px;
}

View File

@ -22,15 +22,19 @@ export default class Welcome extends React.PureComponent {
render() { render() {
const AuthPage = sdk.getComponent("auth.AuthPage"); const AuthPage = sdk.getComponent("auth.AuthPage");
const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage'); const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
const pagesConfig = SdkConfig.get().pages; const pagesConfig = SdkConfig.get().pages;
const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html'; const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html';
return ( return (
<AuthPage> <AuthPage>
<EmbeddedPage className="mx_WelcomePage" <div className="mx_Welcome">
url={pageUrl} <EmbeddedPage className="mx_WelcomePage"
/> url={pageUrl}
/>
<LanguageSelector />
</div>
</AuthPage> </AuthPage>
); );
} }