diff --git a/app/Http/Controllers/Server/ServerController.php b/app/Http/Controllers/Server/ServerController.php index abc229fc2..f08965355 100644 --- a/app/Http/Controllers/Server/ServerController.php +++ b/app/Http/Controllers/Server/ServerController.php @@ -6,6 +6,7 @@ use Auth; use Pterodactyl\Models\Server; use Pterodactyl\Models\Node; use Pterodactyl\Models\Download; +use Pterodactyl\Models\Allocation; use Debugbar; use Uuid; use Alert; @@ -46,6 +47,7 @@ class ServerController extends Controller $server = Server::getByUUID($request->route()->server); return view('server.index', [ 'server' => $server, + 'allocations' => Allocation::where('assigned_to', $server->id)->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(), 'node' => Node::find($server->node) ]); } diff --git a/resources/lang/en/server.php b/resources/lang/en/server.php index bb32307aa..cc7ddcf96 100644 --- a/resources/lang/en/server.php +++ b/resources/lang/en/server.php @@ -23,7 +23,8 @@ return [ 'mem_limit' => 'Memory Limit', 'disk_space' => 'Disk Space', 'control' => 'Control Server', - 'info_use' => 'Information & Usage', + 'usage' => 'Usage', + 'allocation' => 'Allocation', 'command' => 'Enter Console Command', ], 'files' => [ diff --git a/resources/views/admin/servers/view.blade.php b/resources/views/admin/servers/view.blade.php index 91614c611..0a974b85a 100644 --- a/resources/views/admin/servers/view.blade.php +++ b/resources/views/admin/servers/view.blade.php @@ -140,6 +140,13 @@
+
+
+
+ After editing any of the options below you will need to restart the server for changes to take effect. If the server is currently off, you just need to start it and the container will be rebuilt with the new settings. +
+
+
@@ -244,18 +251,55 @@
-
-
- - {!! csrf_field() !!} - - -
-
-

This will trigger a rebuild of the server container when it next starts up. This is useful if you modified the server configuration file manually, or something just didn't work out correctly. Please be aware: if you manually updated the server's configuration file, you will need to restart the daemon before doing this, or it will be overwritten.

-
A rebuild will automatically occur whenever you edit build configuration settings for the server.
-
-
+ + + + + + + + + + + + + + + + + + + +
+ + + + +

This will take you to the server management page that users normally see and allow you to manage server files as well as check the console and data usage.

+
+
+ {!! csrf_field() !!} + +
+ 		+

This will toggle the install status for the server.

+
If you have just created this server it is ill advised to perform this action as the daemon will contact the panel when finished which could cause the install status to be wrongly set.
+
+
+ {!! csrf_field() !!} + +
+ 		+

This will trigger a rebuild of the server container when it next starts up. This is useful if you modified the server configuration file manually, or something just didn't work out correctly. Please be aware: if you manually updated the server's configuration file, you will need to restart the daemon before doing this, or it will be overwritten.

+
A rebuild will automatically occur whenever you edit build configuration settings for the server.
+
+
+ {!! csrf_field() !!} + +
+ 		+
Deleting a server is an irreversible action. All data will be immediately removed relating to this server.
+
diff --git a/resources/views/server/index.blade.php b/resources/views/server/index.blade.php index 1ef71aa59..45719eb74 100644 --- a/resources/views/server/index.blade.php +++ b/resources/views/server/index.blade.php @@ -20,81 +20,85 @@
@endforeach @endforeach -
+
-
-
-
-
-
-
-
-

Active Players

-
- Waiting for response from server... +
+
+
+
+
+
+ +
+
+
+ + +
+
+
+ + + + + + +
- -
-
-

{{ trans('server.index.server_info') }}

- - - - - - - - - - - - - - - - - - - -
{{ trans('server.index.connection') }}{{ $server->ip }}:{{ $server->port }}
{{ trans('strings.node') }}{{ $node->name }}
{{ trans('server.index.mem_limit') }}{{ $server->memory }} MB
{{ trans('server.index.disk_space') }}{{ $server->disk }} MB
-
-
-
-
-
-
- -
-
-
- - -
-
-
- - - - - - + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Below is a listing of all avaliable IPs and Ports for your service. To change the default connection address for your server, simply click on the one you would like to make default below.
+ +
+
+
+
+
+