From 593de63d499308d50f58261534077eafa297dbe6 Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 30 Dec 2016 10:19:58 -0600 Subject: [PATCH 1/3] Adds utils to the close page and an id to the hint question div. --- close.html | 3 ++- close2.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/close.html b/close.html index 3ade05050..c5f60f406 100644 --- a/close.html +++ b/close.html @@ -3,6 +3,7 @@ + @@ -12,7 +13,7 @@

- Did you know? + Did you know?

diff --git a/close2.html b/close2.html index addb037e7..e0606ad72 100644 --- a/close2.html +++ b/close2.html @@ -3,6 +3,7 @@ + @@ -12,7 +13,7 @@

- Did you know? + Did you know?

From 282defc54c4bae5eb986d1370b311369c0f42db5 Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 30 Dec 2016 10:58:21 -0600 Subject: [PATCH 2/3] Pass parameter to close page about current participant is it guest. --- conference.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conference.js b/conference.js index f9e579dcb..116176d36 100644 --- a/conference.js +++ b/conference.js @@ -196,9 +196,11 @@ function maybeRedirectToWelcomePage(options) { // if close page is enabled redirect to it, without further action if (config.enableClosePage) { if (options.feedbackSubmitted) - window.location.pathname = "close.html"; + window.location.pathname = "close.html?guest=" + + APP.tokenData.isGuest; else - window.location.pathname = "close2.html"; + window.location.pathname = "close2.html?guest=" + + APP.tokenData.isGuest; return; } From 63aa60f2d6d86f6bc6ec5352d01ac1705074f9f3 Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 30 Dec 2016 10:59:21 -0600 Subject: [PATCH 3/3] Adds an option for a hint message shown only to guests. --- close.js | 16 ++++++++++++++-- interface_config.js | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/close.js b/close.js index 6e3d3f1d9..8845986e1 100644 --- a/close.js +++ b/close.js @@ -1,4 +1,4 @@ -/* global interfaceConfig */ +/* global interfaceConfig, getConfigParamsFromUrl */ //list of tips var hints = [ "You can pin participants by clicking on their thumbnails.",// jshint ignore:line @@ -32,7 +32,7 @@ function insertTextMsg(id, msg){ var el = document.getElementById(id); if (el) - el.innerText = msg; + el.innerHTML = msg; } /** @@ -42,6 +42,18 @@ function onLoad() { //Works only for close2.html because close.html doesn't have this element. insertTextMsg('thanksMessage', 'Thank you for using ' + interfaceConfig.APP_NAME); + + // If there is a setting show a special message only for the guests + if (interfaceConfig.CLOSE_PAGE_GUEST_HINT) { + let params = getConfigParamsFromUrl('search'); + if ( params.guest ) { + var element = document.getElementById('hintQuestion'); + element.classList.add('hide'); + insertTextMsg('hintMessage', interfaceConfig.CLOSE_PAGE_GUEST_HINT); + return; + } + } + insertTextMsg('hintMessage', getHint()); } diff --git a/interface_config.js b/interface_config.js index fa0db691c..a4220d7b8 100644 --- a/interface_config.js +++ b/interface_config.js @@ -53,6 +53,8 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars * Whether to only show the filmstrip (and hide the toolbar). */ filmStripOnly: false, + //A html text to be shown to guests on the close page, false disables it + CLOSE_PAGE_GUEST_HINT: false, RANDOM_AVATAR_URL_PREFIX: false, RANDOM_AVATAR_URL_SUFFIX: false, FILM_STRIP_MAX_HEIGHT: 120,