[ARVADOS-WORKBENCH2] created: 1.2.0-286-gd6ad041
Git user
git at public.curoverse.com
Wed Sep 5 10:09:00 EDT 2018
at d6ad04144da7e34f37541cfaf7b62b9f7f1f507a (commit)
commit d6ad04144da7e34f37541cfaf7b62b9f7f1f507a
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Sep 5 16:08:40 2018 +0200
description-for-icons-top-bar-are-missing
Feature #14166
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx
index 5e4b339..210dc5a 100644
--- a/src/components/column-selector/column-selector.tsx
+++ b/src/components/column-selector/column-selector.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { WithStyles, StyleRulesCallback, withStyles, IconButton, Paper, List, Checkbox, ListItemText, ListItem } from '@material-ui/core';
+import { WithStyles, StyleRulesCallback, withStyles, IconButton, Paper, List, Checkbox, ListItemText, ListItem, Tooltip } from '@material-ui/core';
import MenuIcon from "@material-ui/icons/Menu";
import { DataColumn } from '../data-table/data-column';
import { Popover } from "../popover/popover";
@@ -56,5 +56,7 @@ export const ColumnSelector = withStyles(styles)(
export const ColumnSelectorTrigger = (props: IconButtonProps) =>
<IconButton {...props}>
- <MenuIcon />
+ <Tooltip title="Filters">
+ <MenuIcon />
+ </Tooltip>
</IconButton>;
diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx
index e346eb8..a00df75 100644
--- a/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/components/dropdown-menu/dropdown-menu.tsx
@@ -6,10 +6,12 @@ import * as React from 'react';
import Menu from '@material-ui/core/Menu';
import IconButton from '@material-ui/core/IconButton';
import { PopoverOrigin } from '@material-ui/core/Popover';
+import { Tooltip } from '@material-ui/core';
interface DropdownMenuProps {
id: string;
icon: React.ReactElement<any>;
+ title: string;
}
interface DropdownMenuState {
@@ -27,7 +29,7 @@ export class DropdownMenu extends React.Component<DropdownMenuProps, DropdownMen
};
render() {
- const { icon, id, children } = this.props;
+ const { icon, id, children, title } = this.props;
const { anchorEl } = this.state;
return (
<div>
@@ -36,7 +38,9 @@ export class DropdownMenu extends React.Component<DropdownMenuProps, DropdownMen
aria-haspopup="true"
color="inherit"
onClick={this.handleOpen}>
- {icon}
+ <Tooltip title={title}>
+ {icon}
+ </Tooltip>
</IconButton>
<Menu
id={id}
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 de6be7e..ee47a01 100644
--- 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";
-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 { User, getUserFullname } from "~/models/user";
import { SearchBar } from "~/components/search-bar/search-bar";
import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
@@ -67,7 +67,9 @@ export const MainAppBar: React.SFC<MainAppBarProps> = (props) => {
<Toolbar >
{props.user && <props.breadcrumbs />}
{props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
- <DetailsIcon />
+ <Tooltip title="Additional Info">
+ <DetailsIcon />
+ </Tooltip>
</IconButton>
}
</Toolbar>
@@ -78,17 +80,19 @@ const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps
return (
<>
<IconButton color="inherit">
- <Badge badgeContent={3} color="primary">
- <NotificationIcon />
- </Badge>
+ <Tooltip title="Notification">
+ <Badge badgeContent={3} color="primary">
+ <NotificationIcon />
+ </Badge>
+ </Tooltip>
</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>
- <DropdownMenu icon={<HelpIcon />} id="help-menu">
+ <DropdownMenu icon={<HelpIcon />} id="help-menu" title="Help">
{renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
</DropdownMenu>
</>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list