Small fixes and cleanup

auto_join_3.3
Håvar Aambø Fosstveit 2020-05-20 23:44:33 +02:00
parent a1aec0a8d3
commit 93cc50ace2
4 changed files with 33 additions and 41 deletions

View File

@ -68,7 +68,7 @@ const About = ({
defaultMessage='About' defaultMessage='About'
/> />
</DialogTitle> </DialogTitle>
<DialogContent dividers='true'> <DialogContent dividers>
<DialogContentText paragraph> <DialogContentText paragraph>
Contributions to this work were made on behalf of the GÉANT Contributions to this work were made on behalf of the GÉANT
project, a project that has received funding from the project, a project that has received funding from the
@ -89,7 +89,7 @@ const About = ({
<Link href='https://edumeet.org' target='_blank' rel='noreferrer' color='secondary' variant='h6' className={classes.link}> <Link href='https://edumeet.org' target='_blank' rel='noreferrer' color='secondary' variant='h6' className={classes.link}>
https://edumeet.org https://edumeet.org
</Link> </Link>
<DialogContentText align='center' variant='h7'> <DialogContentText align='center' variant='body2'>
<FormattedMessage <FormattedMessage
id='label.version' id='label.version'
defaultMessage='Version' defaultMessage='Version'

View File

@ -9,8 +9,6 @@ import { useIntl, FormattedMessage } from 'react-intl';
import Dialog from '@material-ui/core/Dialog'; import Dialog from '@material-ui/core/Dialog';
import DialogTitle from '@material-ui/core/DialogTitle'; import DialogTitle from '@material-ui/core/DialogTitle';
import DialogActions from '@material-ui/core/DialogActions'; import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import DialogContentText from '@material-ui/core/DialogContentText';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
import Paper from '@material-ui/core/Paper'; import Paper from '@material-ui/core/Paper';
import Tabs from '@material-ui/core/Tabs'; import Tabs from '@material-ui/core/Tabs';
@ -62,11 +60,14 @@ const styles = (theme) =>
shortcuts : { shortcuts : {
display : 'flex', display : 'flex',
flexDirection : 'row', flexDirection : 'row',
alignItems : 'center' alignItems : 'center',
paddingLeft : theme.spacing(2),
paddingRight : theme.spacing(2)
}, },
tabsHeader : tabsHeader :
{ {
flexGrow : 1 flexGrow : 1,
marginBottom : theme.spacing(1)
} }
}); });
@ -93,6 +94,7 @@ const Help = ({
/> />
</DialogTitle> </DialogTitle>
<Tabs <Tabs
value={0}
className={classes.tabsHeader} className={classes.tabsHeader}
indicatorColor='primary' indicatorColor='primary'
textColor='primary' textColor='primary'
@ -107,8 +109,6 @@ const Help = ({
} }
/> />
</Tabs> </Tabs>
<DialogContent dividers='true'>
<DialogContentText>
{shortcuts.map((value, index) => {shortcuts.map((value, index) =>
{ {
return ( return (
@ -123,9 +123,6 @@ const Help = ({
</div> </div>
); );
})} })}
</DialogContentText>
</DialogContent>
<DialogActions> <DialogActions>
<Button onClick={() => { handleCloseHelp(false); }} color='primary'> <Button onClick={() => { handleCloseHelp(false); }} color='primary'>
<FormattedMessage <FormattedMessage

View File

@ -324,7 +324,7 @@ const TopBar = (props) =>
currentMenu === 'moreActions' ? currentMenu === 'moreActions' ?
'material-appbar' : undefined 'material-appbar' : undefined
} }
aria-haspopup='true' aria-haspopup
onClick={(event) => handleMenuOpen(event, 'moreActions')} onClick={(event) => handleMenuOpen(event, 'moreActions')}
color='inherit' color='inherit'
> >
@ -501,7 +501,7 @@ const TopBar = (props) =>
</Tooltip> </Tooltip>
} }
<IconButton <IconButton
aria-haspopup='true' aria-haspopup
onClick={handleMobileMenuOpen} onClick={handleMobileMenuOpen}
color='inherit' color='inherit'
> >

View File

@ -49,10 +49,7 @@ const styles = (theme) =>
} }
}); });
const open=true; let dense = false;
const dividers=true;
let dense=false;
const supportedBrowsers=[ const supportedBrowsers=[
{ name: 'Chrome/Chromium', version: '74', vendor: 'Google' }, { name: 'Chrome/Chromium', version: '74', vendor: 'Google' },
@ -72,13 +69,11 @@ const UnsupportedBrowser = ({
}) => }) =>
{ {
if (platform !== 'desktop') if (platform !== 'desktop')
{ dense = true;
dense=true;
}
return ( return (
<Dialog <Dialog
open={open} open
scroll={'body'} scroll={'body'}
classes={{ classes={{
paper : classes.dialogPaper paper : classes.dialogPaper
@ -88,22 +83,22 @@ const UnsupportedBrowser = ({
{!webrtcUnavailable && {!webrtcUnavailable &&
<FormattedMessage <FormattedMessage
id='unsupportedBrowser.titleUnsupportedBrowser' id='unsupportedBrowser.titleUnsupportedBrowser'
defaultMessage='Detected unsupported browser!' defaultMessage='Browser not supported'
/> />
} }
{webrtcUnavailable && {webrtcUnavailable &&
<FormattedMessage <FormattedMessage
id='unsupportedBrowser.titlewebrtcUnavailable' id='unsupportedBrowser.titlewebrtcUnavailable'
defaultMessage='Required functionality not availble in your browser!' defaultMessage='Required functionality not availble in your browser'
/> />
} }
</DialogTitle> </DialogTitle>
<DialogContent dividers={dividers} > <DialogContent dividers>
<FormattedMessage <FormattedMessage
id='unsupportedBrowser.bodyText' id='unsupportedBrowser.bodyText'
defaultMessage='This meeting service requires a defaultMessage='This meeting service requires
functionality that is not supported by your browser. functionality not supported by your browser.
Please upgrade, or switch to a different browser, or Please upgrade, switch to a different browser, or
check your settings. Supported browsers:' check your settings. Supported browsers:'
/> />
<Grid container spacing={2} justify='center' alignItems='center'> <Grid container spacing={2} justify='center' alignItems='center'>