projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge master + cr change
[arvados-workbench2.git]
/
src
/
views-components
/
main-app-bar
/
main-app-bar.tsx
diff --git
a/src/views-components/main-app-bar/main-app-bar.tsx
b/src/views-components/main-app-bar/main-app-bar.tsx
index 44be9f7aa103f3584da4a99091cd11fab4566791..04e0fb804a75dba4ac8eae7116d4606617889aa6 100644
(file)
--- a/
src/views-components/main-app-bar/main-app-bar.tsx
+++ b/
src/views-components/main-app-bar/main-app-bar.tsx
@@
-3,7
+3,7
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem } from "@material-ui/core";
+import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem
, Tooltip
} from "@material-ui/core";
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
import { ArvadosTheme } from '~/common/custom-theme';
import { Link } from "react-router-dom";
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
import { ArvadosTheme } from '~/common/custom-theme';
import { Link } from "react-router-dom";
@@
-83,9
+83,10
@@
export const MainAppBar = withStyles(styles)(
<Toolbar >
{props.user && <props.breadcrumbs />}
{props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
<Toolbar >
{props.user && <props.breadcrumbs />}
{props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
- <DetailsIcon />
- </IconButton>
- }
+ <Tooltip title="Additional Info">
+ <DetailsIcon />
+ </Tooltip>
+ </IconButton>}
</Toolbar>
</AppBar>;
}
</Toolbar>
</AppBar>;
}
@@
-95,17
+96,19
@@
const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps
return (
<>
<IconButton color="inherit">
return (
<>
<IconButton color="inherit">
- <Badge badgeContent={3} color="primary">
- <NotificationIcon />
- </Badge>
+ <Tooltip title="Notification">
+ <Badge badgeContent={3} color="primary">
+ <NotificationIcon />
+ </Badge>
+ </Tooltip>
</IconButton>
</IconButton>
- <DropdownMenu icon={<UserPanelIcon />} id="account-menu">
+ <DropdownMenu icon={<UserPanelIcon />} id="account-menu"
title="Account Management"
>
<MenuItem>
{getUserFullname(user)}
</MenuItem>
{renderMenuItems(menuItems.accountMenu, onMenuItemClick)}
</DropdownMenu>
<MenuItem>
{getUserFullname(user)}
</MenuItem>
{renderMenuItems(menuItems.accountMenu, onMenuItemClick)}
</DropdownMenu>
- <DropdownMenu icon={<HelpIcon />} id="help-menu">
+ <DropdownMenu icon={<HelpIcon />} id="help-menu"
title="Help"
>
{renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
</DropdownMenu>
</>
{renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
</DropdownMenu>
</>