OSX Mem.cpp fix (#70) Thx to @djfinch

* OSX Mem.cp fix
* Fixed current serverTime overflow.
This commit is contained in:
djfinch 2018-03-19 23:04:19 +01:00 committed by Ben Gräf
parent dd3d2db2a0
commit 90202b2920
3 changed files with 6 additions and 6 deletions

View file

@ -89,7 +89,7 @@
$(document).ready(function() {
var table = $('#clientStatusList').DataTable({
dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-10'i><'col-sm-2'<'#serverTime'>>>",
dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-4'i><'col-sm-8'<'#serverTime'>>>",
bPaginate: false,
ajax: {
url: "/admin/getClientStatusList",
@ -329,7 +329,7 @@
currentServerTime = settings.json.current_server_time * 1000;
clockDrift = new Date().getTime() - currentServerTime;
$('#serverTime').html("<div class='dataTables_info'>" + new Date(currentServerTime) + "</div>");
$('#serverTime').html("<div class='dataTables_info text-right'>" + new Date(currentServerTime) + "</div>");
});
table.on('select', function () {
@ -691,4 +691,4 @@
</div>
</div>
</body>
</html>
</html>