X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ba71587fc2058276b9b70c342b990aa6508690a9..d9ee24d0f78a21603e2276d0d3142d4db40a831b:/src/views/link-account-panel/link-account-panel-root.tsx

diff --git a/src/views/link-account-panel/link-account-panel-root.tsx b/src/views/link-account-panel/link-account-panel-root.tsx
index 98d19acedf..2438f04e4f 100644
--- a/src/views/link-account-panel/link-account-panel-root.tsx
+++ b/src/views/link-account-panel/link-account-panel-root.tsx
@@ -26,7 +26,8 @@ type CssRules = 'root';
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     root: {
         width: '100%',
-        overflow: 'auto'
+        overflow: 'auto',
+        display: 'flex'
     }
 });
 
@@ -77,7 +78,7 @@ export const LinkAccountPanelRoot = withStyles(styles)(
                 {isProcessing && <Grid container item direction="column" alignContent="center" spacing={24}>
                     <Grid item>
                         Loading user info. Please wait.
-	       </Grid>
+	                </Grid>
                     <Grid item style={{ alignSelf: 'center' }}>
                         <CircularProgress />
                     </Grid>
@@ -90,27 +91,27 @@ export const LinkAccountPanelRoot = withStyles(styles)(
                             </Grid>
                             <Grid item>
                                 You can link Arvados accounts. After linking, either login will take you to the same account.
-		       </Grid >
+		                    </Grid >
                         </Grid>
                         <Grid container item direction="row" spacing={24}>
                             <Grid item>
                                 <Button disabled={!targetUser.isActive} color="primary" variant="contained" onClick={() => startLinking(LinkAccountType.ADD_OTHER_LOGIN)}>
                                     Add another login to this account
-			   </Button>
+			                    </Button>
                             </Grid>
                             <Grid item>
                                 <Button color="primary" variant="contained" onClick={() => startLinking(LinkAccountType.ACCESS_OTHER_ACCOUNT)}>
                                     Use this login to access another account
-			   </Button>
+			                    </Button>
                             </Grid>
                         </Grid>
                         {hasRemoteHosts && selectedCluster && <Grid container item direction="column" spacing={24}>
                             <Grid item>
                                 You can also link {displayUser(targetUser, false)} with an account from a remote cluster.
-		       </Grid>
+		                    </Grid>
                             <Grid item>
                                 Please select the cluster that hosts the account you want to link with:
-                           <Select id="remoteHostsDropdown" native defaultValue={selectedCluster} style={{ marginLeft: "1em" }}
+                                <Select id="remoteHostsDropdown" native defaultValue={selectedCluster} style={{ marginLeft: "1em" }}
                                     onChange={(event) => setSelectedCluster(event.target.value)}>
                                     {Object.keys(remoteHostsConfig).map((k) => k !== localCluster ? <option key={k} value={k}>{k}</option> : null)}
                                 </Select>
@@ -132,24 +133,24 @@ export const LinkAccountPanelRoot = withStyles(styles)(
                                         <> <Grid item>
                                             This a remote account. You can link a local Arvados account to this one.
                                             After linking, you can access the local account's data by logging into the
-					    <b>{localCluster}</b> cluster as user <b>{targetUser.email}</b>
+					                        <b>{localCluster}</b> cluster as user <b>{targetUser.email}</b>
                                             from <b>{targetUser.uuid.substr(0, 5)}</b>.
-					</Grid >
-                                        <Grid item>
-                                            <Button color="primary" variant="contained" onClick={() => startLinking(LinkAccountType.ADD_LOCAL_TO_REMOTE)}>
-                                                Link an account from {localCluster} to this account
-					    </Button>
-                                        </Grid> </>
-                                   : <Grid item>Please visit cluster
-				       <a href={remoteHostsConfig[loginCluster].workbench2Url + "/link_account"}>{loginCluster}</a>
-                                       to perform account linking.</Grid>
+					                    </Grid >
+                                            <Grid item>
+                                                <Button color="primary" variant="contained" onClick={() => startLinking(LinkAccountType.ADD_LOCAL_TO_REMOTE)}>
+                                                    Link an account from {localCluster} to this account
+					                        </Button>
+                                            </Grid> </>
+                                        : <Grid item>Please visit cluster
+				                        <a href={remoteHostsConfig[loginCluster].workbench2Url + "/link_account"}>{loginCluster}</a>
+                                            to perform account linking.</Grid>
                                     )
-                                 : <Grid item>
-                                     This an inactive remote account. An administrator must activate your
-                                     account before you can proceed.  After your accounts is activated,
-				     you can link a local Arvados account hosted by the <b>{localCluster}</b>
-                                     cluster to this one.
-				 </Grid >}
+                                    : <Grid item>
+                                        This an inactive remote account. An administrator must activate your
+                                        account before you can proceed.  After your accounts is activated,
+				                    you can link a local Arvados account hosted by the <b>{localCluster}</b>
+                                        cluster to this one.
+				                </Grid >}
                             </Grid>
                         </Grid>}
                 </div>}
@@ -158,36 +159,36 @@ export const LinkAccountPanelRoot = withStyles(styles)(
                         {status === LinkAccountPanelStatus.LINKING && <Grid container item direction="column" spacing={24}>
                             <Grid item>
                                 Clicking 'Link accounts' will link {displayUser(userToLink, true, !isLocalUser(targetUser.uuid, localCluster))} to {displayUser(targetUser, true, !isLocalUser(targetUser.uuid, localCluster))}.
-		    </Grid>
+		                    </Grid>
                             {(isLocalUser(targetUser.uuid, localCluster)) && <Grid item>
                                 After linking, logging in as {displayUser(userToLink)} will log you into the same account as {displayUser(targetUser)}.
-		    </Grid>}
+		                    </Grid>}
                             <Grid item>
                                 Any object owned by {displayUser(userToLink)} will be transfered to {displayUser(targetUser)}.
-		    </Grid>
+		                    </Grid>
                             {!isLocalUser(targetUser.uuid, localCluster) && <Grid item>
                                 You can access <b>{userToLink.email}</b> data by logging into <b>{localCluster}</b> with the <b>{targetUser.email}</b> account.
-		    </Grid>}
+		                    </Grid>}
                         </Grid>}
                         {error === LinkAccountPanelError.NON_ADMIN && <Grid item>
                             Cannot link admin account {displayUser(userToLink)} to non-admin account {displayUser(targetUser)}.
-		</Grid>}
+		                </Grid>}
                         {error === LinkAccountPanelError.SAME_USER && <Grid item>
                             Cannot link {displayUser(targetUser)} to the same account.
-		</Grid>}
+		                </Grid>}
                         {error === LinkAccountPanelError.INACTIVE && <Grid item>
                             Cannot link account {displayUser(userToLink)} to inactive account {displayUser(targetUser)}.
-		</Grid>}
+		                </Grid>}
                         <Grid container item direction="row" spacing={24}>
                             <Grid item>
                                 <Button variant="contained" onClick={() => cancelLinking()}>
                                     Cancel
-			</Button>
+			                    </Button>
                             </Grid>
                             <Grid item>
                                 <Button disabled={status === LinkAccountPanelStatus.ERROR} color="primary" variant="contained" onClick={() => linkAccount()}>
                                     Link accounts
-			</Button>
+			                    </Button>
                             </Grid>
                         </Grid>
                     </Grid>}