16622: Tweak icon & titles

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index ffba2876843ef4ce06de9708398cbb926f01e366..bceee5043589c0d8b94b0e278fe8543177ff373e 100644 (file)
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -26,6 +26,7 @@ import ErrorRoundedIcon from '@material-ui/icons/ErrorRounded';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import FlipToFront from '@material-ui/icons/FlipToFront';
 import Folder from '@material-ui/icons/Folder';
+import FolderShared from '@material-ui/icons/FolderShared';
 import GetApp from '@material-ui/icons/GetApp';
 import Help from '@material-ui/icons/Help';
 import HelpOutline from '@material-ui/icons/HelpOutline';
@@ -67,7 +68,7 @@ library.add(
     faSlash,
 );
 
-export const ReadOnlyIcon = (props:any) =>
+export const ReadOnlyIcon = (props: any) =>
     <span {...props}>
         <div className="fa-layers fa-1x fa-fw">
             <span className="fas fa-slash"
@@ -103,7 +104,7 @@ export const DirectoryIcon: IconType = (props) => <Folder {...props} />;
 export const DownloadIcon: IconType = (props) => <GetApp {...props} />;
 export const EditSavedQueryIcon: IconType = (props) => <Create {...props} />;
 export const ExpandIcon: IconType = (props) => <ExpandMoreIcon {...props} />;
-export const ErrorIcon: IconType = (props) => <ErrorRoundedIcon style={{color: '#ff0000'}} {...props} />;
+export const ErrorIcon: IconType = (props) => <ErrorRoundedIcon style={{ color: '#ff0000' }} {...props} />;
 export const FavoriteIcon: IconType = (props) => <Star {...props} />;
 export const FileIcon: IconType = (props) => <LibraryBooks {...props} />;
 export const HelpIcon: IconType = (props) => <Help {...props} />;
@@ -143,3 +144,4 @@ export const UsedByIcon: IconType = (props) => <Folder {...props} />;
 export const WorkflowIcon: IconType = (props) => <Code {...props} />;
 export const WarningIcon: IconType = (props) => <Warning style={{ color: '#fbc02d', height: '30px', width: '30px' }} {...props} />;
 export const Link: IconType = (props) => <LinkOutlined {...props} />;
+export const FolderSharedIcon: IconType = (props) => <FolderShared {...props} />;

diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index 170e7e9a30237a7af9d4293dd7207882627e7225..afdc03b5f5a43f830ff2027f4a45905af5655cf0 100644 (file)
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -17,7 +17,8 @@ import {
     AdvancedIcon,
     OpenIcon,
     Link,
-    RestoreVersionIcon
+    RestoreVersionIcon,
+    FolderSharedIcon
 } from "~/components/icon/icon";
 import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
@@ -88,8 +89,8 @@ export const readOnlyCollectionActionSet: ContextMenuActionSet = [[
     ...commonActionSet.reduce((prev, next) => prev.concat(next), []),
     toggleFavoriteAction,
     {
-        icon: AdvancedIcon,
-        name: "Connecting with WebDav or S3",
+        icon: FolderSharedIcon,
+        name: "Open as network folder or S3 bucket",
         execute: (dispatch, resource) => {
             dispatch<any>(openWebDavS3InfoDialog(resource.uuid));
         }

diff --git a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
index cd3888483dbaba088fa9bb1d296be2b634d18b21..5b797e30db22dfae1f85b3fd4700688ca27f0c11 100644 (file)
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -82,12 +82,12 @@ export const WebDavS3InfoDialog = compose(
             onClose={props.closeDialog}
             style={{ alignSelf: 'stretch' }}>
             <CardHeader
-                title={`WebDAV and S3`} />
+                title={`Open as Network Folder or S3 Bucket`} />
             <div className={props.classes.details} >
                 <Tabs value={props.data.activeTab} onChange={props.data.setActiveTab}>
                     <Tab key="cyberduck" label="Cyberduck/Mountain Duck or Gnome Files" />
                     <Tab key="windows" label="Windows or MacOS" />
-                    <Tab key="s3" label="Using an S3 client" />
+                    <Tab key="s3" label="S3 bucket" />
                 </Tabs>
 
                 <TabPanel index={1} value={props.data.activeTab}>