StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Dane Everitt 2019-08-04 13:49:26 -07:00
commit 81143e231a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 303 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/themes/pterodactyl/js/admin/node/view-servers.js
View file

@ -101,11 +101,13 @@
currentCpu = parseFloat(((info.proc.cpu.total / cpuMax) * 100).toFixed(2).toString());
}
element.find('[data-action="memory"]').html(parseInt(info.proc.memory.total / (1024 * 1024)));
element.find('[data-action="disk"]').html(parseInt(info.proc.disk.used));
element.find('[data-action="cpu"]').html(currentCpu);
} else {
element.find('[data-action="memory"]').html('--');
element.find('[data-action="disk"]').html('--');
element.find('[data-action="cpu"]').html('--');
}
});
});
})();
})();

2
public/themes/pterodactyl/js/frontend/files/filemanager.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
View file

File diff suppressed because one or more lines are too long

6
public/themes/pterodactyl/js/frontend/files/src/actions.js
View file

@ -397,8 +397,10 @@ class ActionsClass {
{
let formattedItems = "";
let i = 0;
let self = this;
$.each(selectedItems, function(key, value) {
formattedItems += ("<code>" + this.sanitizedString(value) + "</code>, ");
formattedItems += ("<code>" + self.sanitizedString(value) + "</code>, ");
i++;
return i < 5;
});
@ -411,7 +413,7 @@ class ActionsClass {
swal({
type: 'warning',
title: '',
text: 'Are you sure you want to delete the following files: ' + this.sanitizedString(formattedItems) + '?',
text: 'Are you sure you want to delete the following files: ' + formattedItems + '?',
html: true,
showCancelButton: true,
showConfirmButton: true,

2
public/themes/pterodactyl/js/frontend/serverlist.js
View file

@ -74,9 +74,11 @@
}
element.find('[data-action="memory"]').html(parseInt(data.proc.memory.total / (1024 * 1024)));
element.find('[data-action="cpu"]').html(currentCpu);
element.find('[data-action="disk"]').html(parseInt(data.proc.disk.used));
} else {
element.find('[data-action="memory"]').html('--');
element.find('[data-action="cpu"]').html('--');
element.find('[data-action="disk"]').html('--');
}
}
}).fail(function (jqXHR) {