Browse Source

feat(Watermarks): Add deafault logo prop.

master
Hristo Terezov 4 years ago
parent
commit
8e9a51f742

+ 3
- 0
css/_variables.scss View File

164
 $watermarkWidth: 186px;
164
 $watermarkWidth: 186px;
165
 $watermarkHeight: 74px;
165
 $watermarkHeight: 74px;
166
 
166
 
167
+$welcomePageWatermarkWidth: 186px;
168
+$welcomePageWatermarkHeight: 74px;
169
+
167
 /**
170
 /**
168
  * Welcome page variables.
171
  * Welcome page variables.
169
  */
172
  */

+ 5
- 0
css/_welcome_page.scss View File

211
         position: absolute;
211
         position: absolute;
212
         width: 100%;
212
         width: 100%;
213
         height: 100%;
213
         height: 100%;
214
+
215
+        .watermark.leftwatermark {
216
+            width: $welcomePageWatermarkWidth;
217
+            height: $welcomePageWatermarkHeight;
218
+        }
214
     }
219
     }
215
 }
220
 }

+ 1
- 0
interface_config.js View File

48
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
48
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
49
     DEFAULT_LOGO_URL: 'images/watermark.png',
49
     DEFAULT_LOGO_URL: 'images/watermark.png',
50
     DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
50
     DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
51
+    DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.png',
51
 
52
 
52
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
53
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
53
 
54
 

+ 8
- 2
react/features/base/react/components/web/Watermarks.js View File

47
      */
47
      */
48
     _welcomePageIsVisible: boolean,
48
     _welcomePageIsVisible: boolean,
49
 
49
 
50
+    /**
51
+     * The default value for the Jitsi logo URL.
52
+     */
53
+    defaultJitsiLogoURL: ?string,
54
+
50
     /**
55
     /**
51
      * Invoked to obtain translated strings.
56
      * Invoked to obtain translated strings.
52
      */
57
      */
218
         let reactElement = null;
223
         let reactElement = null;
219
         const {
224
         const {
220
             _customLogoUrl,
225
             _customLogoUrl,
221
-            _customLogoLink
226
+            _customLogoLink,
227
+            defaultJitsiLogoURL
222
         } = this.props;
228
         } = this.props;
223
 
229
 
224
         if (this._canDisplayJitsiWatermark()) {
230
         if (this._canDisplayJitsiWatermark()) {
225
             const link = _customLogoLink || this.state.jitsiWatermarkLink;
231
             const link = _customLogoLink || this.state.jitsiWatermarkLink;
226
             const style = {
232
             const style = {
227
-                backgroundImage: `url(${_customLogoUrl || interfaceConfig.DEFAULT_LOGO_URL})`,
233
+                backgroundImage: `url(${_customLogoUrl || defaultJitsiLogoURL || interfaceConfig.DEFAULT_LOGO_URL})`,
228
                 maxWidth: 140,
234
                 maxWidth: 140,
229
                 maxHeight: 70
235
                 maxHeight: 70
230
             };
236
             };

+ 2
- 2
react/features/welcome/components/WelcomePage.web.js View File

159
      */
159
      */
160
     render() {
160
     render() {
161
         const { _moderatedRoomServiceUrl, t } = this.props;
161
         const { _moderatedRoomServiceUrl, t } = this.props;
162
-        const { APP_NAME } = interfaceConfig;
162
+        const { APP_NAME, DEFAULT_WELCOME_PAGE_LOGO_URL } = interfaceConfig;
163
         const showAdditionalContent = this._shouldShowAdditionalContent();
163
         const showAdditionalContent = this._shouldShowAdditionalContent();
164
         const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
164
         const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
165
         const showResponsiveText = this._shouldShowResponsiveText();
165
         const showResponsiveText = this._shouldShowResponsiveText();
170
                     ? 'with-content' : 'without-content'}` }
170
                     ? 'with-content' : 'without-content'}` }
171
                 id = 'welcome_page'>
171
                 id = 'welcome_page'>
172
                 <div className = 'welcome-watermark'>
172
                 <div className = 'welcome-watermark'>
173
-                    <Watermarks />
173
+                    <Watermarks defaultJitsiLogoURL = { DEFAULT_WELCOME_PAGE_LOGO_URL } />
174
                 </div>
174
                 </div>
175
                 <div className = 'header'>
175
                 <div className = 'header'>
176
                     <div className = 'welcome-page-settings'>
176
                     <div className = 'welcome-page-settings'>

Loading…
Cancel
Save