15530: Turn Site Manager Link into Button

diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index 16b8b0bb085cc6af854509966349907c43a34731..a67228bcca47c6c6c9fd7f117eb17f2a87f640c3 100644 (file)
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -97,7 +97,7 @@ export const LoginPanel = withStyles(styles)(
                     <Button variant="contained" color="primary" style={{ margin: "1em" }} className={classes.button}
                         onClick={() => dispatch(login(uuidPrefix, homeCluster, loginCluster, remoteHosts))}>
                         Log in to {uuidPrefix}
-                        {uuidPrefix !== homeCluster &&
+                        {uuidPrefix !== homeCluster && loginCluster !== homeCluster &&
                             <span>&nbsp;with user from {homeCluster}</span>}
                     </Button>
                 </Typography>

diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx
index 59119403893f456e74bac818346d9c1f6ae82d2e..96f4a56528a54945dbb96dcb68ef9a576aa204e5 100644 (file)
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -21,9 +21,9 @@ import {
 import { createTree } from '~/models/tree';
 import { getInitialResourceTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
 import { SearchResultsPanelProps } from "./search-results-panel";
-import { Link } from 'react-router-dom';
 import { Routes } from '~/routes/routes';
-import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core';
+import { Link } from 'react-router-dom';
+import { StyleRulesCallback, withStyles, WithStyles, Button } from '@material-ui/core';
 import { ArvadosTheme } from '~/common/custom-theme';
 
 export enum SearchResultsPanelColumnNames {
@@ -41,7 +41,8 @@ export type CssRules = 'siteManagerLink';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     siteManagerLink: {
-        marginLeft: theme.spacing.unit * 2
+        marginRight: theme.spacing.unit * 2,
+        float: 'right'
     }
 });
 
@@ -125,7 +126,9 @@ export const SearchResultsPanelView = withStyles(styles, { withTheme: true })(
                 <div>{(props.localCluster !== homeCluster && loggedIn.length === 1) ?
                     <span>Searching local cluster {props.localCluster} only.  To search multiple clusters, <a href={props.remoteHostsConfig[homeCluster] && props.remoteHostsConfig[homeCluster].workbench2Url}> start from your home Workbench.</a></span> :
                     <span>Searching clusters: {loggedIn.map((ss) => <span key={ss.clusterId}> {ss.clusterId}</span>)}</span>}
-                    <Link to={Routes.SITE_MANAGER} className={props.classes.siteManagerLink}>Site Manager</Link>
+                    <Link to={Routes.SITE_MANAGER} >
+                        <Button className={props.classes.siteManagerLink} >Site Manager</Button>
+                    </Link>
                 </div>
             }
         />;