Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2777 from pterodactyl/matthewpi/file-manager-patch-1

Browse source 
Move file manager buttons beside the breadcrumb
This commit is contained in:
Dane Everitt 2020-12-06 11:30:27 -08:00 committed by GitHub
commit 360d93bf2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/scripts/components/elements/SubNavigation.tsx
View file

@ -17,11 +17,12 @@ const SubNavigation = styled.div`
${tw`ml-2`};
}
&:active, &:hover {
&:hover {
${tw`text-neutral-100`};
}
&:active, &:hover, &.active {
&:active, &.active {
${tw`text-neutral-100`};
box-shadow: inset 0 -2px ${config.theme.colors.cyan['500']};
}
}

2
resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
View file

@ -44,7 +44,7 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
};
return (
<div css={tw`flex items-center text-sm mb-4 text-neutral-500`}>
<div css={tw`flex flex-grow-0 items-center text-sm text-neutral-500 overflow-x-hidden`}>
{(files && files.length > 0 && !params?.action) ?
<FileActionCheckbox
type={'checkbox'}

35
resources/scripts/components/server/files/FileManagerContainer.tsx
View file

@ -51,9 +51,28 @@ export default () => {
return (
<ServerContentBlock title={'File Manager'} showFlashKey={'files'}>
<div css={tw`flex flex-wrap-reverse md:flex-no-wrap justify-center mb-4`}>
<ErrorBoundary>
<FileManagerBreadcrumbs/>
</ErrorBoundary>
<Can action={'file.create'}>
<ErrorBoundary>
<div css={tw`flex flex-shrink-0 flex-wrap-reverse md:flex-no-wrap justify-end mb-4 md:mb-0 ml-0 md:ml-auto`}>
<NewDirectoryButton css={tw`w-full flex-none mt-4 sm:mt-0 sm:w-auto sm:mr-4`}/>
<UploadButton css={tw`flex-1 mr-4 sm:flex-none sm:mt-0`}/>
<NavLink
to={`/server/${id}/files/new${window.location.hash}`}
css={tw`flex-1 sm:flex-none sm:mt-0`}
>
<Button css={tw`w-full`}>
New File
</Button>
</NavLink>
</div>
</ErrorBoundary>
</Can>
</div>
{
!files ?
<Spinner size={'large'} centered/>
@ -83,22 +102,6 @@ export default () => {
</div>
</CSSTransition>
}
<Can action={'file.create'}>
<ErrorBoundary>
<div css={tw`flex flex-wrap-reverse justify-end mt-4`}>
<NewDirectoryButton css={tw`w-full flex-none mt-4 sm:mt-0 sm:w-auto sm:mr-4`}/>
<UploadButton css={tw`flex-1 mr-4 sm:flex-none sm:mt-0`}/>
<NavLink
to={`/server/${id}/files/new${window.location.hash}`}
css={tw`flex-1 sm:flex-none sm:mt-0`}
>
<Button css={tw`w-full`}>
New File
</Button>
</NavLink>
</div>
</ErrorBoundary>
</Can>
</>
}
</ServerContentBlock>