MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/react-admin

Browse Source
This commit is contained in:
Matthew Penner
2021-01-27 23:18:06 -07:00
parent 31c26a2de4 5515871b2f
commit b856ab17bd
39 changed files with 438 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en/admin/server.php
View File

@@ -29,6 +29,6 @@ return [
'node_required' => 'You must have at least one node configured before you can add a server to this panel.',
'transfer_nodes_required' => 'You must have at least two nodes configured before you can transfer servers.',
'transfer_started' => 'Server transfer has been started.',
'transfer_not_viable' => 'The node you selected is not viable for this transfer.',
'transfer_not_viable' => 'The node you selected does not have the required disk space or memory available to accommodate this server.',
],
];

24
resources/scripts/components/server/settings/SettingsContainer.tsx
View File

@@ -30,19 +30,23 @@ export default () => {
<TitledGreyBox title={'SFTP Details'} css={tw`mb-6 md:mb-10`}>
<div>
<Label>Server Address</Label>
<Input
type={'text'}
value={`sftp://${sftp.ip}:${sftp.port}`}
readOnly
/>
<CopyOnClick text={`sftp://${sftp.ip}:${sftp.port}`}>
<Input
type={'text'}
value={`sftp://${sftp.ip}:${sftp.port}`}
readOnly
/>
</CopyOnClick>
</div>
<div css={tw`mt-6`}>
<Label>Username</Label>
<Input
type={'text'}
value={`${username}.${id}`}
readOnly
/>
<CopyOnClick text={`${username}.${id}`}>
<Input
type={'text'}
value={`${username}.${id}`}
readOnly
/>
</CopyOnClick>
</div>
<div css={tw`mt-6 flex items-center`}>
<div css={tw`flex-1`}>