浏览代码

Merge pull request #1322 from jitsi/livestream_help_link

livestream link help link
j8
yanas 8 年前
父节点
当前提交
94391234cc
共有 4 个文件被更改,包括 21 次插入2 次删除
  1. 9
    0
      css/components/_link.scss
  2. 3
    1
      interface_config.js
  3. 1
    0
      lang/main.json
  4. 8
    1
      modules/UI/recording/Recording.js

+ 9
- 0
css/components/_link.scss 查看文件

@@ -8,4 +8,13 @@
8 8
         text-decoration: underline;
9 9
         @include transition(color .1s ease-in);
10 10
     }
11
+}
12
+
13
+/**
14
+ * Helper links are links that are meant to open a documentation page or more
15
+ * detailed info.
16
+ */
17
+.helper-link {
18
+    @extend .link;
19
+    font-size: 12px;
11 20
 }

+ 3
- 1
interface_config.js 查看文件

@@ -70,5 +70,7 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
70 70
     AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)",
71 71
     POLICY_LOGO: null,
72 72
     LOCAL_THUMBNAIL_RATIO: 16/9, //16:9
73
-    REMOTE_THUMBNAIL_RATIO: 1 //1:1
73
+    REMOTE_THUMBNAIL_RATIO: 1, //1:1
74
+    // Documentation reference for the live streaming feature.
75
+    LIVE_STREAMING_HELP_LINK: "https://jitsi.org/live"
74 76
 };

+ 1
- 0
lang/main.json 查看文件

@@ -387,6 +387,7 @@
387 387
         "failedToStart": "Live streaming failed to start",
388 388
         "buttonTooltip": "Start / Stop live stream",
389 389
         "streamIdRequired": "Please fill in the stream id in order to launch the live streaming.",
390
+        "streamIdHelp": "Where do I find this?",
390 391
         "error": "Live streaming failed. Please try again.",
391 392
         "busy": "All recorders are currently busy. Please try again later."
392 393
     }

+ 8
- 1
modules/UI/recording/Recording.js 查看文件

@@ -51,6 +51,9 @@ function _requestLiveStreamId() {
51 51
     const streamIdRequired
52 52
         = APP.translation.generateTranslationHTML(
53 53
             "liveStreaming.streamIdRequired");
54
+    const streamIdHelp
55
+        = APP.translation.generateTranslationHTML(
56
+            "liveStreaming.streamIdHelp");
54 57
 
55 58
     return new Promise(function (resolve, reject) {
56 59
         dialog = APP.UI.messageHandler.openDialogWithStates({
@@ -60,7 +63,11 @@ function _requestLiveStreamId() {
60 63
                     `<input  class="input-control"
61 64
                     name="streamId" type="text"
62 65
                     data-i18n="[placeholder]dialog.streamKey"
63
-                    autofocus>`,
66
+                    autofocus><div style="text-align: right">
67
+                    <a class="helper-link" target="_new" 
68
+                    href="${interfaceConfig.LIVE_STREAMING_HELP_LINK}">`
69
+                        + streamIdHelp
70
+                        + `</a></div>`,
64 71
                 persistent: false,
65 72
                 buttons: [
66 73
                     {title: cancelButton, value: false},

正在加载...
取消
保存