Ilya Daynatovich vor 8 Jahren
Ursprung
Commit
5e7e5b317b

+ 29
- 0
css/_inlay.scss Datei anzeigen

@@ -0,0 +1,29 @@
1
+.inlay {
2
+    margin-top: 14%;
3
+    @include border-radius(3px);
4
+    padding: 40px 38px 44px;
5
+    color: #fff;
6
+    background: lighten($defaultBackground, 20%);
7
+    text-align: center;
8
+
9
+    &__title {
10
+        margin: 12px 0;
11
+        padding-bottom: 17px;
12
+        color: $popoverFontColor;
13
+        font-size: 21px;
14
+        letter-spacing: 0.3px;
15
+        border-bottom: 1px solid $auiBorderColor;
16
+    }
17
+
18
+    &__text {
19
+        color: $popoverFontColor;
20
+        display: block;
21
+        margin-top: 22px;
22
+        font-size: 16px;
23
+    }
24
+
25
+    &__icon {
26
+        margin: 0 10px;
27
+        font-size: 50px;
28
+    }
29
+}

+ 1
- 0
css/main.scss Datei anzeigen

@@ -38,6 +38,7 @@
38 38
 @import 'toastr';
39 39
 @import 'base';
40 40
 @import 'overlay/overlay';
41
+@import 'inlay';
41 42
 @import 'reload_overlay/reload_overlay';
42 43
 @import 'modals/dialog';
43 44
 @import 'modals/feedback/feedback';

+ 1
- 30
css/overlay/_overlay.scss Datei anzeigen

@@ -26,35 +26,6 @@
26 26
     &__policy {
27 27
         position: absolute;
28 28
         bottom: 24px;
29
-    }
30
-}
31
-
32
-.inlay {
33
-    margin-top: 14%;
34
-    @include border-radius(3px);
35
-    padding: 40px 38px 44px;
36
-    color: #fff;
37
-    background: lighten($defaultBackground, 20%);
38
-    text-align: center;
39
-
40
-    &__title {
41
-        margin: 12px 0;
42
-        padding-bottom: 17px;
43
-        color: $popoverFontColor;
44
-        font-size: 21px;
45
-        letter-spacing: 0.3px;
46
-        border-bottom: 1px solid $auiBorderColor;
47
-    }
48
-
49
-    &__text {
50
-        color: $popoverFontColor;
51
-        display: block;
52
-        margin-top: 22px;
53
-        font-size: 16px;
54
-    }
55
-
56
-    &__icon {
57
-        margin: 0 10px;
58
-        font-size: 50px;
29
+        width: 100%;
59 30
     }
60 31
 }

+ 2
- 1
interface_config.js Datei anzeigen

@@ -57,5 +57,6 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
57 57
     // disables the ringing sound when the RingOverlay is shown.
58 58
     DISABLE_RINGING: false,
59 59
     AUDIO_LEVEL_PRIMARY_COLOR: "rgba(255,255,255,0.4)",
60
-    AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)"
60
+    AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)",
61
+    POLICY_LOGO: null
61 62
 };

+ 4
- 0
lang/main.json Datei anzeigen

@@ -75,6 +75,10 @@
75 75
             "content": "Learn about your users through easy integration with Piwik, Google Analytics, and other usage monitoring and statistics systems."
76 76
         }
77 77
     },
78
+    "startupoverlay": {
79
+        "policyText": " ",
80
+        "title": "Jitsi Meet needs to use your microphone and camera."
81
+    },
78 82
     "toolbar": {
79 83
         "mute": "Mute / Unmute",
80 84
         "videomute": "Start / stop camera",

+ 20
- 21
modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js Datei anzeigen

@@ -22,32 +22,31 @@ class GUMOverlayImpl extends Overlay {
22 22
      * @inheritDoc
23 23
      */
24 24
     _buildOverlayContent() {
25
-    // `<span data-i18n='[html]userMedia.${this.browser}GrantPermissions'
26
-    // class='inlay__text'></span>`
27
-        let title = 'HipChat Video needs to use your microphone and camera.';
28
-        let text;
29
-        text = 'Select "Allow" when your browser asks for these permissions.';
30
-        let content = (
25
+        let textKey = `userMedia.${this.browser}GrantPermissions`;
26
+        let titleKey = 'startupoverlay.title';
27
+        let policyTextKey = 'startupoverlay.policyText';
28
+        let policyLogo = '';
29
+        let policyLogoSrc = interfaceConfig.POLICY_LOGO;
30
+        if (policyLogoSrc) {
31
+            policyLogo += (
32
+                `<div class="policy__logo">
33
+                    <img src="${policyLogoSrc}"/>
34
+                </div>`
35
+            );
36
+        }
37
+
38
+        return (
31 39
             `<div class="inlay">
32 40
                 <span class="inlay__icon icon-microphone"></span>
33 41
                 <span class="inlay__icon icon-camera"></span>
34
-                <h3 class="inlay__title">${title}</h3>
35
-                <span class='inlay__text'>${text}</span>
42
+                <h3 class="inlay__title" data-i18n="${titleKey}"></h3>
43
+                <span class='inlay__text'data-i18n='[html]${textKey}'></span>
44
+            </div>
45
+            <div class="policy overlay__policy">
46
+                <p class="policy__text" data-i18n="[html]${policyTextKey}"></p>
47
+                ${policyLogo}
36 48
             </div>`
37 49
         );
38
-
39
-        if (interfaceConfig.HAS_POLICY) {
40
-            content += (
41
-                `<div class="policy overlay__policy">
42
-                    <p class="policy__text" data-i18n="policyText"></p>
43
-                    <div class="policy__logo">
44
-                        <img src=""/>
45
-                    </div>
46
-                </div>`
47
-            );
48
-        }
49
-
50
-        return content;
51 50
     }
52 51
 }
53 52
 

Laden…
Abbrechen
Speichern