-
-
-
-
@@ -144,6 +132,7 @@
+
diff --git a/interface_config.js b/interface_config.js
index adff2c338..1e07ad678 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -17,6 +17,10 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
APP_NAME: "Jitsi Meet",
INVITATION_POWERED_BY: true,
+ /**
+ * If we should show authentication block in profile
+ */
+ AUTHENTICATION_ENABLE: true,
// the toolbar buttons line is intentionally left in one line, to be able
// to easily override values or remove them using regex
MAIN_TOOLBAR_BUTTONS: ['microphone', 'camera', 'desktop', 'invite', 'fullscreen', 'hangup'], // jshint ignore:line
diff --git a/lang/main.json b/lang/main.json
index 979f300f3..0c6d1ac73 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -151,6 +151,7 @@
},
"connectionindicator":
{
+ "header": "Connection data",
"bitrate": "Bitrate:",
"packetloss": "Packet loss:",
"resolution": "Resolution:",
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index d132e6b9f..a8f542d01 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -764,6 +764,7 @@ UI.getRemoteVideoType = function (jid) {
UI.connectionIndicatorShowMore = function(id) {
VideoLayout.showMore(id);
+ return false;
};
// FIXME check if someone user this
@@ -1140,11 +1141,12 @@ UI.notifyFocusLeft = function () {
* @param {string} [login] current login
*/
UI.updateAuthInfo = function (isAuthEnabled, login) {
+ let showAuth = isAuthEnabled && UIUtil.isAuthenticationEnabled();
let loggedIn = !!login;
- Toolbar.showAuthenticateButton(isAuthEnabled);
+ Toolbar.showAuthenticateButton(showAuth);
- if (isAuthEnabled) {
+ if (showAuth) {
Toolbar.setAuthenticatedIdentity(login);
Toolbar.showLoginButton(!loggedIn);
diff --git a/modules/UI/authentication/LoginDialog.js b/modules/UI/authentication/LoginDialog.js
index e730e848a..6ee3606f3 100644
--- a/modules/UI/authentication/LoginDialog.js
+++ b/modules/UI/authentication/LoginDialog.js
@@ -8,16 +8,15 @@ function getPasswordInputHtml() {
let placeholder = config.hosts.authdomain
? "user identity"
: "user@domain.net";
- let passRequiredMsg = APP.translation.translateString(
- "dialog.passwordRequired"
- );
+
return `
-
';
var self = this;
this.element.on("mouseenter", function () {
self.elementIsHovered = true;
@@ -76,7 +76,7 @@ var JitsiPopover = (function () {
*/
JitsiPopover.prototype.createPopover = function () {
$("body").append(this.template);
- $(".jitsipopover > .jitsipopover-content").html(this.options.content);
+ $(".jitsipopover > .jitsipopover__content").html(this.options.content);
var self = this;
$(".jitsipopover").on("mouseenter", function () {
self.popoverIsHovered = true;
@@ -103,7 +103,7 @@ var JitsiPopover = (function () {
$(".jitsipopover").css(
{top: position.top, left: position.left, display: "table"});
$(".jitsipopover > .arrow").css({left: calcLeft});
- $(".jitsipopover > .jitsiPopupmenuPadding").css(
+ $(".jitsipopover > .jitsipopover__menu-padding").css(
{left: calcLeft - 50});
}
});
diff --git a/modules/UI/util/UIUtil.js b/modules/UI/util/UIUtil.js
index daa1b3570..fe4d1f739 100644
--- a/modules/UI/util/UIUtil.js
+++ b/modules/UI/util/UIUtil.js
@@ -204,6 +204,15 @@ const TOOLTIP_POSITIONS = {
return interfaceConfig.SETTINGS_SECTIONS.indexOf(name) !== -1;
},
+ /**
+ * Indicates if Authentication Section should be shown
+ *
+ * @returns {boolean}
+ */
+ isAuthenticationEnabled: function() {
+ return interfaceConfig.AUTHENTICATION_ENABLE;
+ },
+
/**
* Shows the element given by id.
*
diff --git a/modules/UI/videolayout/ConnectionIndicator.js b/modules/UI/videolayout/ConnectionIndicator.js
index f7056f9d1..f9744fa37 100644
--- a/modules/UI/videolayout/ConnectionIndicator.js
+++ b/modules/UI/videolayout/ConnectionIndicator.js
@@ -80,10 +80,10 @@ ConnectionIndicator.prototype.generateText = function () {
packetLoss = "N/A";
} else {
- packetLoss = "↓" +
+ packetLoss = "↓" +
(this.packetLoss.download !== null ?
this.packetLoss.download : "N/A") +
- "% ↑" +
+ "% ↑" +
(this.packetLoss.upload !== null? this.packetLoss.upload : "N/A") +
"%";
}
@@ -95,31 +95,48 @@ ConnectionIndicator.prototype.generateText = function () {
return `${width}x${height}`;
}).join(', ') || 'N/A';
- var result = "${passRequiredMsg}
- + - `; + placeholder="user password">`; } /** @@ -80,6 +79,7 @@ function LoginDialog(successCallback, cancelCallback) { const states = { login: { + title: APP.translation.translateString('dialog.passwordRequired'), html: getPasswordInputHtml(), buttons: loginButtons, focus: ':input:first', diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js index 3d346b163..01c02b31f 100644 --- a/modules/UI/toolbars/Toolbar.js +++ b/modules/UI/toolbars/Toolbar.js @@ -391,11 +391,9 @@ Toolbar = { * @param show true to show or false to hide */ showAuthenticateButton (show) { - if (UIUtil.isButtonEnabled('authentication') && show) { - $('#authentication').css({display: "inline"}); - } else { - $('#authentication').css({display: "none"}); - } + let display = show ? 'block' : 'none'; + + $('#authenticationContainer').css({display}); }, showEtherpadButton () { @@ -449,12 +447,14 @@ Toolbar = { * @param authIdentity identity name to be displayed. */ setAuthenticatedIdentity (authIdentity) { + let selector = $('#toolbar_auth_identity'); + if (authIdentity) { - let selector = $('#toolbar_auth_identity'); selector.css({display: "list-item"}); selector.text(authIdentity); } else { - $('#toolbar_auth_identity').css({display: "none"}); + selector.css({display: "none"}); + selector.text(''); } }, @@ -463,7 +463,7 @@ Toolbar = { * @param show true to show */ showLoginButton (show) { - if (UIUtil.isButtonEnabled('authentication') && show) { + if (show) { $('#toolbar_button_login').css({display: "list-item"}); } else { $('#toolbar_button_login').css({display: "none"}); @@ -475,7 +475,7 @@ Toolbar = { * @param show true to show */ showLogoutButton (show) { - if (UIUtil.isButtonEnabled('authentication') && show) { + if (show) { $('#toolbar_button_logout').css({display: "list-item"}); } else { $('#toolbar_button_logout').css({display: "none"}); diff --git a/modules/UI/util/JitsiPopover.js b/modules/UI/util/JitsiPopover.js index f99d57747..24acae8de 100644 --- a/modules/UI/util/JitsiPopover.js +++ b/modules/UI/util/JitsiPopover.js @@ -29,8 +29,8 @@ var JitsiPopover = (function () { this.element = element; this.template = '' +
- '' +
- '
';
+ '' +
+ '| " + - translate("connectionindicator.bitrate") + " | " + - "↓" + - downloadBitrate + " ↑" + - uploadBitrate + " | " + - "
| " + - translate("connectionindicator.packetloss") + " | " + - "" + packetLoss + " | " + - "
| " + - translate("connectionindicator.resolution") + " | " + - "" + resolutionStr + " |
| + + ${translate("connectionindicator.bitrate")} + + | ++ ↓${downloadBitrate} + ↑${uploadBitrate} + | +
| + + ${translate("connectionindicator.packetloss")} + + | +${packetLoss} | +
| + + ${translate("connectionindicator.resolution")} + + | ++ ${resolutionStr} + | +
" +
translate("connectionindicator." + (this.showMoreValue ? "less" : "more")) +
- "
"; + ""; } if (this.showMoreValue) { @@ -138,7 +155,7 @@ ConnectionIndicator.prototype.generateText = function () { if (!this.transport || this.transport.length === 0) { transport = "
| " + - "" + + "" + translate("connectionindicator.bandwidth") + "" + " | " + - "↓" + + "↓" + downloadBandwidth + - " ↑" + + " ↑" + uploadBandwidth + " |
" +
+ {content: "
" +
APP.translation.translateString("connectionindicator.na") + "
",
skin: "black"});
@@ -379,9 +396,9 @@ ConnectionIndicator.prototype.updatePopoverData = function (force) {
// popover is visible or we force to do so.
if(this.popover.popoverShown || force) {
this.popover.updateContent(
- `${this.generateText()}
`
+ `${this.generateText()}
`
);
- APP.translation.translateElement($(".connection_info"));
+ APP.translation.translateElement($(".connection-info"));
}
};