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

add small notification to terminal if new invisible output is available

Browse source
This commit is contained in:
Jakob Schrettenbrunner 2016-12-10 00:17:23 +01:00
parent 96462a119f
commit c80c6714a1
2 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
public/themes/default/css/pterodactyl.css
View file

@ -286,6 +286,24 @@ li.btn.btn-default.pill:active,li.btn.btn-default.pill:focus,li.btn.btn-default.
opacity: 1; opacity: 1;
} }
#consoleNotify {
position: absolute;
bottom: 0;
margin-right: 17px;
margin-bottom: 2px;
z-index: 10;
background: white;
right: 0;
opacity: .6;
padding: 5px 7px;
border-radius: 5px;
cursor: pointer;
}
#consoleNotify:hover {
opacity: .9;
}
.hasFileHover { .hasFileHover {
border: 2px dashed #0087F7; border: 2px dashed #0087F7;
border-radius: 5px; border-radius: 5px;

26
resources/views/server/index.blade.php
View file

@ -50,6 +50,9 @@
<div class="alert alert-info hidden" id="consoleThrottled"> <div class="alert alert-info hidden" id="consoleThrottled">
The console is currently being throttled due to the speed at which data is being sent. Messages are being queued and will appear as the queue is worked through. The console is currently being throttled due to the speed at which data is being sent. Messages are being queued and will appear as the queue is worked through.
</div> </div>
<div id="consoleNotify" class="hidden">
<i class="fa fa-bell"></i>
</div>
<div id="terminal"> <div id="terminal">
</div> </div>
</div> </div>
@ -199,6 +202,24 @@ $(window).load(function () {
} }
}); });
const $consoleNotify = $('#consoleNotify');
$consoleNotify.on('click', function () {
terminal.scroll_to_bottom();
$consoleNotify.removeClass('hidden');
});
terminal.on('scroll', function() {
if (terminal.is_bottom()) {
$consoleNotify.addClass('hidden');
}
})
function terminalNotifyOutput() {
if (!terminal.is_bottom()) {
$consoleNotify.removeClass('hidden');
}
}
var ctc = $('#chart_cpu'); var ctc = $('#chart_cpu');
var timeLabels = []; var timeLabels = [];
var cpuData = []; var cpuData = [];
@ -327,11 +348,14 @@ $(window).load(function () {
$('#consoleThrottled').addClass('hidden'); $('#consoleThrottled').addClass('hidden');
} }
if (outputQueue.length > 0) {
for (var i = 0; i < {{ env('CONSOLE_PUSH_COUNT', 10) }} && outputQueue.length > 0; i++) for (var i = 0; i < {{ env('CONSOLE_PUSH_COUNT', 10) }} && outputQueue.length > 0; i++)
{ {
terminal.echo(outputQueue[0]); terminal.echo(outputQueue[0]);
outputQueue.shift(); outputQueue.shift();
} }
terminalNotifyOutput();
}
} }
// Update Listings on Initial Status // Update Listings on Initial Status
@ -348,8 +372,10 @@ $(window).load(function () {
timeout: 10000 timeout: 10000
}).done(function(data) { }).done(function(data) {
terminal.echo(data); terminal.echo(data);
terminalNotifyOutput();
}).fail(function() { }).fail(function() {
terminal.error('Unable to load initial server log, try reloading the page.'); terminal.error('Unable to load initial server log, try reloading the page.');
terminalNotifyOutput();
}); });
} }
updateServerPowerControls(data.status); updateServerPowerControls(data.status);