diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 2346d686..dd070d00 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -39,6 +39,7 @@ import { useHistory, useLocation } from 'react-router-dom'; import IconButton from '@material-ui/core/IconButton'; import Tooltip from '@material-ui/core/Tooltip'; import { config } from '../config'; +import InfoIcon from '@material-ui/icons/Info'; const styles = (theme) => ({ @@ -186,7 +187,6 @@ const JoinDialog = ({ }) => { - const location = useLocation(); const history = useHistory(); @@ -671,6 +671,51 @@ const JoinDialog = ({ + { config.infoTooltipText!=='' && + +
+ + { config.infoTooltipLink!=='' && + {config.infoTooltipText} + } + + { config.infoTooltipLink==='' && +

{config.infoTooltipText}

+ } +
+ } + { config.infoTooltipDesc!=='' && +
+ {config.infoTooltipDesc} +
+ } {/* {authType === 'auth' && !loggedIn && diff --git a/app/src/config.ts b/app/src/config.ts index c0a0eab4..402f6cd4 100644 --- a/app/src/config.ts +++ b/app/src/config.ts @@ -498,6 +498,24 @@ Setting 'play' to null disables the sound notification. format : 'String', default : 'edumeet' }, + infoTooltipText : + { + doc : 'Informative text on the join page. If empty hidden.', + format : 'String', + default : '' + }, + infoTooltipLink : + { + doc : 'Informative text link site on the join page. If empty hidden.', + format : 'String', + default : '' + }, + infoTooltipDesc : + { + doc : 'Informative text description on the join page. If empty hidden.', + format : 'String', + default : '' + }, supportUrl : { doc : 'The service & Support URL; if `null`, it will be not displayed on the about dialogs.', diff --git a/app/src/index.js b/app/src/index.js index 6c34400e..39a207df 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -101,6 +101,7 @@ function run() const hideNoVideoParticipants = parameters.get('hideNoVideoParticipants'); const filmstripmode = parameters.get('filmstrip'); // filmstrip mode by default const acceptCookie = parameters.get('acceptCookie'); // auto accept cookie popup + const hideSelfView = parameters.get('hideSelfView'); if (filmstripmode === 'true') { @@ -242,6 +243,11 @@ function run() roomClient.setHideNoVideoParticipants(true); } + if (hideSelfView === 'true') + { + store.dispatch(roomActions.setHideSelfView(hideSelfView)); + } + global.CLIENT = roomClient; render(