From 732a433ec1c83473960e46cdd7bf194dbdb24728 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Tue, 14 Feb 2017 16:07:12 -0600
Subject: [PATCH 1/3] livestream link to provide more context to users on where
 to retrieve their stream key

---
 lang/main.json                    | 1 +
 modules/UI/recording/Recording.js | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lang/main.json b/lang/main.json
index 3e398633a..78a8249d1 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -387,6 +387,7 @@
         "failedToStart": "Live streaming failed to start",
         "buttonTooltip": "Start / Stop live stream",
         "streamIdRequired": "Please fill in the stream id in order to launch the live streaming.",
+        "streamIdHelp": "Where do I find this?",
         "error": "Live streaming failed. Please try again.",
         "busy": "All recorders are currently busy. Please try again later."
     }
diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index 26153f8b5..bed6be570 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -51,6 +51,9 @@ function _requestLiveStreamId() {
     const streamIdRequired
         = APP.translation.generateTranslationHTML(
             "liveStreaming.streamIdRequired");
+    const streamIdHelp
+        = APP.translation.generateTranslationHTML(
+            "liveStreaming.streamIdHelp");
 
     return new Promise(function (resolve, reject) {
         dialog = APP.UI.messageHandler.openDialogWithStates({
@@ -60,7 +63,8 @@ function _requestLiveStreamId() {
                     `<input  class="input-control"
                     name="streamId" type="text"
                     data-i18n="[placeholder]dialog.streamKey"
-                    autofocus>`,
+                    autofocus><div style="text-align: right">
+                    <a class="link" target="_new" href="https://jitsi.org/live">`+streamIdHelp+`</a></div>`,
                 persistent: false,
                 buttons: [
                     {title: cancelButton, value: false},

From 6d664f133e3ba479044ee630d4b179dc03bc50d7 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Tue, 14 Feb 2017 17:11:31 -0600
Subject: [PATCH 2/3] Cosmetic fixes for column length lint errors

---
 modules/UI/recording/Recording.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index bed6be570..d8a805fff 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -64,7 +64,9 @@ function _requestLiveStreamId() {
                     name="streamId" type="text"
                     data-i18n="[placeholder]dialog.streamKey"
                     autofocus><div style="text-align: right">
-                    <a class="link" target="_new" href="https://jitsi.org/live">`+streamIdHelp+`</a></div>`,
+                    <a class="link" target="_new" 
+                    href="https://jitsi.org/live">`+streamIdHelp+
+                    `</a></div>`,
                 persistent: false,
                 buttons: [
                     {title: cancelButton, value: false},

From d84901f19639d72b780b6bf9e474a1e06dc513b8 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Wed, 15 Feb 2017 17:57:57 -0600
Subject: [PATCH 3/3] Font size adjustment and moving link to config param

---
 css/components/_link.scss         | 9 +++++++++
 interface_config.js               | 4 +++-
 modules/UI/recording/Recording.js | 7 ++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/css/components/_link.scss b/css/components/_link.scss
index c8631350f..3844abc49 100644
--- a/css/components/_link.scss
+++ b/css/components/_link.scss
@@ -8,4 +8,13 @@
         text-decoration: underline;
         @include transition(color .1s ease-in);
     }
+}
+
+/**
+ * Helper links are links that are meant to open a documentation page or more
+ * detailed info.
+ */
+.helper-link {
+    @extend .link;
+    font-size: 12px;
 }
\ No newline at end of file
diff --git a/interface_config.js b/interface_config.js
index d477cba43..2da4f00a8 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -70,5 +70,7 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
     AUDIO_LEVEL_SECONDARY_COLOR: "rgba(255,255,255,0.2)",
     POLICY_LOGO: null,
     LOCAL_THUMBNAIL_RATIO: 16/9, //16:9
-    REMOTE_THUMBNAIL_RATIO: 1 //1:1
+    REMOTE_THUMBNAIL_RATIO: 1, //1:1
+    // Documentation reference for the live streaming feature.
+    LIVE_STREAMING_HELP_LINK: "https://jitsi.org/live"
 };
diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index d8a805fff..9cd9fd6dd 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -64,9 +64,10 @@ function _requestLiveStreamId() {
                     name="streamId" type="text"
                     data-i18n="[placeholder]dialog.streamKey"
                     autofocus><div style="text-align: right">
-                    <a class="link" target="_new" 
-                    href="https://jitsi.org/live">`+streamIdHelp+
-                    `</a></div>`,
+                    <a class="helper-link" target="_new" 
+                    href="${interfaceConfig.LIVE_STREAMING_HELP_LINK}">`
+                        + streamIdHelp
+                        + `</a></div>`,
                 persistent: false,
                 buttons: [
                     {title: cancelButton, value: false},