From 93cc50ace29ea162385557ce50e4b97fb42e8756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Wed, 20 May 2020 23:44:33 +0200
Subject: [PATCH] Small fixes and cleanup

---
 app/src/components/Controls/About.js     |  4 +--
 app/src/components/Controls/Help.js      | 43 +++++++++++-------------
 app/src/components/Controls/TopBar.js    |  4 +--
 app/src/components/UnsupportedBrowser.js | 23 +++++--------
 4 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js
index 103df43..77cbc8a 100644
--- a/app/src/components/Controls/About.js
+++ b/app/src/components/Controls/About.js
@@ -68,7 +68,7 @@ const About = ({
 					defaultMessage='About'
 				/>
 			</DialogTitle>
-			<DialogContent dividers='true'>
+			<DialogContent dividers>
 				<DialogContentText paragraph>
 					Contributions to this work were made on behalf of the GÉANT
 					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}>
 					https://edumeet.org
 				</Link>
-				<DialogContentText align='center' variant='h7'>
+				<DialogContentText align='center' variant='body2'>
 					<FormattedMessage
 						id='label.version'
 						defaultMessage='Version'
diff --git a/app/src/components/Controls/Help.js b/app/src/components/Controls/Help.js
index d789d10..1058f2e 100644
--- a/app/src/components/Controls/Help.js
+++ b/app/src/components/Controls/Help.js
@@ -9,8 +9,6 @@ import { useIntl, FormattedMessage } from 'react-intl';
 import Dialog from '@material-ui/core/Dialog';
 import DialogTitle from '@material-ui/core/DialogTitle';
 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 Paper from '@material-ui/core/Paper';
 import Tabs from '@material-ui/core/Tabs';
@@ -62,11 +60,14 @@ const styles = (theme) =>
 		shortcuts : {
 			display       : 'flex',
 			flexDirection : 'row',
-			alignItems    : 'center'
+			alignItems    : 'center',
+			paddingLeft   : theme.spacing(2),
+			paddingRight  : theme.spacing(2)
 		},
 		tabsHeader :
 		{
-			flexGrow : 1
+			flexGrow     : 1,
+			marginBottom : theme.spacing(1)
 		}
 	});
 
@@ -93,6 +94,7 @@ const Help = ({
 				/>
 			</DialogTitle>
 			<Tabs
+				value={0}
 				className={classes.tabsHeader}
 				indicatorColor='primary'
 				textColor='primary'
@@ -107,25 +109,20 @@ const Help = ({
 					}
 				/>
 			</Tabs>
-			<DialogContent dividers='true'>
-				<DialogContentText>
-					{shortcuts.map((value, index) =>
-					{
-						return (
-							<div key={index} className={classes.shortcuts}>
-								<Paper className={classes.paper}>
-									{value.key}
-								</Paper>
-								<FormattedMessage
-									id={value.label}
-									defaultMessage={value.defaultMessage}
-								/>
-							</div>
-						);
-					})}
-
-				</DialogContentText>
-			</DialogContent>
+			{shortcuts.map((value, index) =>
+			{
+				return (
+					<div key={index} className={classes.shortcuts}>
+						<Paper className={classes.paper}>
+							{value.key}
+						</Paper>
+						<FormattedMessage
+							id={value.label}
+							defaultMessage={value.defaultMessage}
+						/>
+					</div>
+				);
+			})}
 			<DialogActions>
 				<Button onClick={() => { handleCloseHelp(false); }} color='primary'>
 					<FormattedMessage
diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index 55bb849..d381e4a 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -324,7 +324,7 @@ const TopBar = (props) =>
 									currentMenu === 'moreActions' ?
 										'material-appbar' : undefined
 								}
-								aria-haspopup='true'
+								aria-haspopup
 								onClick={(event) => handleMenuOpen(event, 'moreActions')}
 								color='inherit'
 							>
@@ -501,7 +501,7 @@ const TopBar = (props) =>
 						</Tooltip>
 						}
 						<IconButton
-							aria-haspopup='true'
+							aria-haspopup
 							onClick={handleMobileMenuOpen}
 							color='inherit'
 						>
diff --git a/app/src/components/UnsupportedBrowser.js b/app/src/components/UnsupportedBrowser.js
index 480e792..223bda3 100644
--- a/app/src/components/UnsupportedBrowser.js
+++ b/app/src/components/UnsupportedBrowser.js
@@ -49,10 +49,7 @@ const styles = (theme) =>
 		}
 	});
 
-const open=true;
-const dividers=true;
-
-let dense=false;
+let dense = false;
 
 const supportedBrowsers=[
 	{ name: 'Chrome/Chromium', version: '74', vendor: 'Google' },
@@ -72,13 +69,11 @@ const UnsupportedBrowser = ({
 }) =>
 {
 	if (platform !== 'desktop')
-	{
-		dense=true;
-	}
+		dense = true;
 
 	return (
 		<Dialog
-			open={open}
+			open
 			scroll={'body'}
 			classes={{
 				paper : classes.dialogPaper
@@ -88,22 +83,22 @@ const UnsupportedBrowser = ({
 				{!webrtcUnavailable &&
 				<FormattedMessage
 					id='unsupportedBrowser.titleUnsupportedBrowser'
-					defaultMessage='Detected unsupported browser!'
+					defaultMessage='Browser not supported'
 				/>
 				}
 				{webrtcUnavailable &&
 				<FormattedMessage
 					id='unsupportedBrowser.titlewebrtcUnavailable'
-					defaultMessage='Required functionality not availble in your browser!'
+					defaultMessage='Required functionality not availble in your browser'
 				/>
 				}
 			</DialogTitle>
-			<DialogContent dividers={dividers} >
+			<DialogContent dividers>
 				<FormattedMessage
 					id='unsupportedBrowser.bodyText'
-					defaultMessage='This meeting service requires a
-						functionality that is not supported by your browser.
-						Please upgrade, or switch to a different browser, or
+					defaultMessage='This meeting service requires
+						functionality not supported by your browser.
+						Please upgrade, switch to a different browser, or
 						check your settings. Supported browsers:'
 				/>
 				<Grid container spacing={2} justify='center' alignItems='center'>