Add console popout option.
Popout: https://s3.kelp.in/IrTyE.png Menu: https://s3.kelp.in/JYwlC.png Menu Hover: https://s3.kelp.in/cPtSf.png
This commit is contained in:
Dane Everitt
parent
eeeb4b7580
commit
f58858206e
8 changed files with 199 additions and 104 deletions
|
|
@ -10,6 +10,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
|
|||
* `[beta.1]` — Fixes panel looking for an old compiled classfile that is no longer used. This was causing errors relating to `missing class DingoAPI` when trying to upgrade the panel.
|
||||
* `[beta.1]` — Should fix render issues when trying to edit some files via the panel file editor.
|
||||
|
||||
### Added
|
||||
* Ability to launch the console in a new window as an individual unit. https://s3.kelp.in/IrTyE.png
|
||||
|
||||
## v0.6.0-beta.1 (Courageous Carniadactylus)
|
||||
### Fixed
|
||||
* `[pre.7]` — Fixes bug with subuser checkbox display.
|
||||
|
|
|
|||
|
|
@ -65,6 +65,31 @@ class ServerController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders server console as an individual item.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $uuid
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function getConsole(Request $request, $uuid)
|
||||
{
|
||||
\Debugbar::disable();
|
||||
$server = Models\Server::byUuid($uuid);
|
||||
|
||||
$server->js([
|
||||
'config' => [
|
||||
'console_count' => config('pterodactyl.console.count'),
|
||||
'console_freq' => config('pterodactyl.console.freq'),
|
||||
],
|
||||
]);
|
||||
|
||||
return view('server.console', [
|
||||
'server' => $server,
|
||||
'node' => $server->node,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders file overview page.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -24,8 +24,9 @@ var InitialLogSent = false;
|
|||
|
||||
(function initConsole() {
|
||||
window.TerminalQueue = [];
|
||||
window.ConsoleServerStatus = 0;
|
||||
window.Terminal = $('#terminal').terminal(function (command, term) {
|
||||
Socket.emit('send command', command);
|
||||
Socket.emit((ConsoleServerStatus !== 0) ? 'send command' : 'set status', command);
|
||||
}, {
|
||||
greetings: '',
|
||||
name: Pterodactyl.server.uuid,
|
||||
|
|
@ -80,6 +81,7 @@ var InitialLogSent = false;
|
|||
(function setupSocketListeners() {
|
||||
// Update Listings on Initial Status
|
||||
Socket.on('initial status', function (data) {
|
||||
ConsoleServerStatus = data.status;
|
||||
if (! InitialLogSent) {
|
||||
updateServerPowerControls(data.status);
|
||||
|
||||
|
|
@ -91,6 +93,7 @@ var InitialLogSent = false;
|
|||
|
||||
// Update Listings on Status
|
||||
Socket.on('status', function (data) {
|
||||
ConsoleServerStatus = data.status;
|
||||
updateServerPowerControls(data.status);
|
||||
});
|
||||
|
||||
|
|
@ -134,6 +137,11 @@ $(document).ready(function () {
|
|||
}
|
||||
});
|
||||
|
||||
(function setupChartElements() {
|
||||
if (typeof SkipConsoleCharts !== 'undefined') {
|
||||
return;
|
||||
}
|
||||
|
||||
Socket.on('proc', function (proc) {
|
||||
if (CPUData.length > 10) {
|
||||
CPUData.shift();
|
||||
|
|
@ -151,7 +159,6 @@ $(document).ready(function () {
|
|||
MemoryChart.update();
|
||||
});
|
||||
|
||||
|
||||
var ctc = $('#chart_cpu');
|
||||
var TimeLabels = [];
|
||||
var CPUData = [];
|
||||
|
|
@ -242,4 +249,5 @@ $(document).ready(function () {
|
|||
}
|
||||
}
|
||||
});
|
||||
})();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,7 +17,10 @@
|
|||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
$('#console-popout').on('click', function (event) {
|
||||
event.preventDefault();
|
||||
window.open($(this).attr('href'), 'Pterodactyl Console', 'width=800,height=400');
|
||||
});
|
||||
var Server = (function () {
|
||||
|
||||
function initSocket() {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ return [
|
|||
'server' => [
|
||||
'header' => 'SERVER MANAGEMENT',
|
||||
'console' => 'Console',
|
||||
'console-pop' => 'Fullscreen Console',
|
||||
'file_management' => 'File Management',
|
||||
'file_browser' => 'File Browser',
|
||||
'create_file' => 'Create File',
|
||||
|
|
|
|||
|
|
@ -126,6 +126,11 @@
|
|||
<li class="{{ Route::currentRouteName() !== 'server.index' ?: 'active' }}">
|
||||
<a href="{{ route('server.index', $server->uuidShort) }}">
|
||||
<i class="fa fa-terminal"></i> <span>@lang('navigation.server.console')</span>
|
||||
<span class="pull-right-container muted muted-hover" href="{{ route('server.console', $server->uuidShort) }}" id="console-popout">
|
||||
<span class="label label-default pull-right" style="padding: 3px 5px 2px 5px;">
|
||||
<i class="fa fa-external-link"></i>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@can('list-files', $server)
|
||||
|
|
|
|||
49
resources/themes/pterodactyl/server/console.blade.php
Normal file
49
resources/themes/pterodactyl/server/console.blade.php
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{{-- Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com> --}}
|
||||
|
||||
{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}}
|
||||
{{-- of this software and associated documentation files (the "Software"), to deal --}}
|
||||
{{-- in the Software without restriction, including without limitation the rights --}}
|
||||
{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}}
|
||||
{{-- copies of the Software, and to permit persons to whom the Software is --}}
|
||||
{{-- furnished to do so, subject to the following conditions: --}}
|
||||
|
||||
{{-- The above copyright notice and this permission notice shall be included in all --}}
|
||||
{{-- copies or substantial portions of the Software. --}}
|
||||
|
||||
{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}}
|
||||
{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}}
|
||||
{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}}
|
||||
{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}}
|
||||
{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}}
|
||||
{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}}
|
||||
{{-- SOFTWARE. --}}
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>{{ Settings::get('company', 'Pterodactyl') }} - Console → {{ $server->name }}</title>
|
||||
@include('layouts.scripts')
|
||||
{!! Theme::css('vendor/terminal/jquery.terminal.css') !!}
|
||||
</head>
|
||||
<body style="margin:0;width:100%;height:100%;">
|
||||
<div id="terminal" style="width:100%"></div>
|
||||
<div id="terminalNotify" class="terminal-notify hidden">
|
||||
<i class="fa fa-bell"></i>
|
||||
</div>
|
||||
</body>
|
||||
<script>window.SkipConsoleCharts = true</script>
|
||||
{!! Theme::js('js/laroute.js') !!}
|
||||
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
|
||||
{!! Theme::js('vendor/socketio/socket.io.min.js') !!}
|
||||
{!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js') !!}
|
||||
{!! Theme::js('js/frontend/server.socket.js') !!}
|
||||
{!! Theme::js('vendor/mousewheel/jquery.mousewheel-min.js') !!}
|
||||
{!! Theme::js('vendor/terminal/jquery.terminal.min.js') !!}
|
||||
{!! Theme::js('vendor/terminal/unix_formatting.js') !!}
|
||||
{!! Theme::js('js/frontend/console.js') !!}
|
||||
<script>
|
||||
Terminal.resize($(window).innerWidth() - 20, $(window).innerHeight() - 20);
|
||||
$(window).on('resize', function () {
|
||||
Terminal.resize($(window).innerWidth() - 20, $(window).innerHeight() - 20);
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
Route::get('/', 'ServerController@getIndex')->name('server.index');
|
||||
Route::get('/console', 'ServerController@getConsole')->name('server.console');
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue