haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Watermarks): Add deafault logo prop.

This commit is contained in:
Hristo Terezov 2020-08-11 17:44:19 -05:00
parent 004c1b65ad
commit 8e9a51f742
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/_variables.scss
View File

@ -164,6 +164,9 @@ $unsupportedDesktopBrowserTextFontSize: 21px;
$watermarkWidth: 186px; $watermarkWidth: 186px;
$watermarkHeight: 74px; $watermarkHeight: 74px;
$welcomePageWatermarkWidth: 186px;
$welcomePageWatermarkHeight: 74px;
/** /**
* Welcome page variables. * Welcome page variables.
*/ */

5
css/_welcome_page.scss
View File

@ -211,5 +211,10 @@ body.welcome-page {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
.watermark.leftwatermark {
width: $welcomePageWatermarkWidth;
height: $welcomePageWatermarkHeight;
}
} }
} }

1
interface_config.js
View File

@ -48,6 +48,7 @@ var interfaceConfig = {
DEFAULT_LOCAL_DISPLAY_NAME: 'me', DEFAULT_LOCAL_DISPLAY_NAME: 'me',
DEFAULT_LOGO_URL: 'images/watermark.png', DEFAULT_LOGO_URL: 'images/watermark.png',
DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster', DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.png',
DISABLE_DOMINANT_SPEAKER_INDICATOR: false, DISABLE_DOMINANT_SPEAKER_INDICATOR: false,

10
react/features/base/react/components/web/Watermarks.js
View File

@ -47,6 +47,11 @@ type Props = {
*/ */
_welcomePageIsVisible: boolean, _welcomePageIsVisible: boolean,
/**
* The default value for the Jitsi logo URL.
*/
defaultJitsiLogoURL: ?string,
/** /**
* Invoked to obtain translated strings. * Invoked to obtain translated strings.
*/ */
@ -218,13 +223,14 @@ class Watermarks extends Component<Props, State> {
let reactElement = null; let reactElement = null;
const { const {
_customLogoUrl, _customLogoUrl,
_customLogoLink _customLogoLink,
defaultJitsiLogoURL
} = this.props; } = this.props;
if (this._canDisplayJitsiWatermark()) { if (this._canDisplayJitsiWatermark()) {
const link = _customLogoLink || this.state.jitsiWatermarkLink; const link = _customLogoLink || this.state.jitsiWatermarkLink;
const style = { const style = {
backgroundImage: `url(${_customLogoUrl || interfaceConfig.DEFAULT_LOGO_URL})`, backgroundImage: `url(${_customLogoUrl || defaultJitsiLogoURL || interfaceConfig.DEFAULT_LOGO_URL})`,
maxWidth: 140, maxWidth: 140,
maxHeight: 70 maxHeight: 70
}; };

4
react/features/welcome/components/WelcomePage.web.js
View File

@ -159,7 +159,7 @@ class WelcomePage extends AbstractWelcomePage {
*/ */
render() { render() {
const { _moderatedRoomServiceUrl, t } = this.props; const { _moderatedRoomServiceUrl, t } = this.props;
const { APP_NAME } = interfaceConfig; const { APP_NAME, DEFAULT_WELCOME_PAGE_LOGO_URL } = interfaceConfig;
const showAdditionalContent = this._shouldShowAdditionalContent(); const showAdditionalContent = this._shouldShowAdditionalContent();
const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent(); const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
const showResponsiveText = this._shouldShowResponsiveText(); const showResponsiveText = this._shouldShowResponsiveText();
@ -170,7 +170,7 @@ class WelcomePage extends AbstractWelcomePage {
? 'with-content' : 'without-content'}` } ? 'with-content' : 'without-content'}` }
id = 'welcome_page'> id = 'welcome_page'>
<div className = 'welcome-watermark'> <div className = 'welcome-watermark'>
<Watermarks /> <Watermarks defaultJitsiLogoURL = { DEFAULT_WELCOME_PAGE_LOGO_URL } />
</div> </div>
<div className = 'header'> <div className = 'header'>
<div className = 'welcome-page-settings'> <div className = 'welcome-page-settings'>