mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
feature #1664: Update dashboard
This commit is contained in:
1 parent
1ca669a1d8
commit
b99eef1be5
10 files changed
+263
-59
No files matched your search
@@ -6585,7 +6585,7 @@ form.creation {
|
||||
}
|
||||
|
||||
/* line 606, ../sass/app.scss */
|
||||
.dashboard h1.subheader {
|
||||
.dashboard h2.subheader {
|
||||
margin-bottom: 0;
|
||||
margin-top: 0;
|
||||
}
|
||||
@@ -6596,11 +6596,21 @@ form.creation {
|
||||
}
|
||||
|
||||
/* line 615, ../sass/app.scss */
|
||||
.dashboard h3.subheader {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* line 619, ../sass/app.scss */
|
||||
ul.button-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* line 619, ../sass/app.scss */
|
||||
/* line 623, ../sass/app.scss */
|
||||
.value_td {
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
/* line 627, ../sass/app.scss */
|
||||
small {
|
||||
color: #b6b6b6 !important;
|
||||
}
|
||||
@@ -192,17 +192,21 @@ var dashboard_tab_content = '\
|
||||
<h4 class="subheader"><i class="icon-hdd"></i> '+tr("Hosts")+'</h4>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">112</h4>\
|
||||
<h6 class="subheader">'+tr("TOTAL")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="total_hosts" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("TOTAL")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">90</h4>\
|
||||
<h6 class="subheader">'+tr("ON")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="on_hosts" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("ON")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">22</h4>\
|
||||
<h6 class="subheader">'+tr("ERROR")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="off_hosts" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("OFF")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="three columns">\
|
||||
<h2 id="error_hosts" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("ERROR")+'</small></h3>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
@@ -213,17 +217,21 @@ var dashboard_tab_content = '\
|
||||
<h4 class="subheader"><i class="icon-cloud"></i> '+tr("Virtual Machines")+'</h4>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">112</h4>\
|
||||
<h6 class="subheader">'+tr("TOTAL")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="total_vms" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("TOTAL")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">90</h4>\
|
||||
<h6 class="subheader">'+tr("ACTIVE")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="active_vms" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("ACTIVE")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="four columns">\
|
||||
<h1 class="subheader">22</h4>\
|
||||
<h6 class="subheader">'+tr("FAILED")+'</h6>\
|
||||
<div class="three columns">\
|
||||
<h2 id="pending_vms" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("PENDING")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="three columns">\
|
||||
<h2 id="failed_vms" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("FAILED")+'</small></h3>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
@@ -237,12 +245,12 @@ var dashboard_tab_content = '\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">1254</h4>\
|
||||
<h6 class="subheader">'+tr("IMAGES")+'</h6>\
|
||||
<h2 id="total_images" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("IMAGES")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">7 TB</h4>\
|
||||
<h6 class="subheader">'+tr("SIZE")+'</h6>\
|
||||
<h2 id="size_images" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("SIZE")+'</small></h3>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
@@ -254,12 +262,12 @@ var dashboard_tab_content = '\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">8343</h4>\
|
||||
<h6 class="subheader">'+tr("USERS")+'</h6>\
|
||||
<h2 id="total_users" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("USERS")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">297</h4>\
|
||||
<h6 class="subheader">'+tr("GROUPS")+'</h6>\
|
||||
<h2 id="total_groups" class="subheader">297</h2>\
|
||||
<h3 class="subheader"><small>'+tr("GROUPS")+'</small></h3>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
@@ -271,12 +279,12 @@ var dashboard_tab_content = '\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">50</h4>\
|
||||
<h6 class="subheader">'+tr("VNETS")+'</h6>\
|
||||
<h2 id="total_vnets" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("VNETS")+'</small></h3>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<h1 class="subheader">1243</h4>\
|
||||
<h6 class="subheader">'+tr("ADDRESSES")+'</h6>\
|
||||
<h2 id="addresses_vnets" class="subheader"></h2>\
|
||||
<h3 class="subheader"><small>'+tr("ADDRESSES")+'</small></h3>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
|
||||
@@ -42,9 +42,16 @@ var groups_tab_content = '\
|
||||
<form class="custom" id="group_form" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-group"></i> '+tr("Groups")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_groups"/> <small>'+tr("TOTAL")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -448,9 +455,16 @@ function updateGroupsView(request, group_list){
|
||||
});
|
||||
updateView(group_list_array,dataTable_groups);
|
||||
updateGroupSelect(group_list);
|
||||
SunstoneMonitoring.monitor('GROUP', group_list)
|
||||
if (mustBeAdmin())
|
||||
updateSystemDashboard("groups",group_list);
|
||||
//SunstoneMonitoring.monitor('GROUP', group_list)
|
||||
//if (mustBeAdmin())
|
||||
// updateSystemDashboard("groups",group_list);
|
||||
|
||||
|
||||
$("#total_groups", $dashboard).text(group_list.length);
|
||||
|
||||
var form = $("#group_form");
|
||||
|
||||
$("#total_groups", form).text(group_list.length);
|
||||
}
|
||||
|
||||
function updateGroupInfo(request,group){
|
||||
|
||||
@@ -40,9 +40,16 @@ var hosts_tab_content = '\
|
||||
<form class="custom" id="form_hosts" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-hdd"></i> '+tr("Hosts")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_hosts"/> <small>'+tr("TOTAL")+'</small> <span id="on_hosts"/> <small>'+tr("ON")+'</small> <span id="off_hosts"/> <small>'+tr("OFF")+'</small> <span id="error_hosts"/> <small>'+tr("ERROR")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -641,6 +648,24 @@ function hostElementArray(host_json){
|
||||
var info_str = humanize_size(real_mem) + ' / ' + humanize_size(max_mem) + ' (' + ratio_real_mem + '%)';
|
||||
var pb_real_mem = quotaBarHtml(real_mem, max_mem, info_str);
|
||||
|
||||
var state_simple = OpenNebula.Helper.resource_state("host_simple",host.STATE);
|
||||
switch (state_simple) {
|
||||
case tr("INIT"):
|
||||
case tr("UPDATE"):
|
||||
case tr("ON"):
|
||||
on_hosts++;
|
||||
break;
|
||||
case tr("ERROR"):
|
||||
case tr("RETRY"):
|
||||
error_hosts++;
|
||||
break;
|
||||
case tr("OFF"):
|
||||
off_hosts++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="host_'+host.ID+'" name="selected_items" value="'+host.ID+'"/>',
|
||||
host.ID,
|
||||
@@ -651,7 +676,7 @@ function hostElementArray(host_json){
|
||||
pb_allocated_cpu,
|
||||
pb_real_mem,
|
||||
pb_allocated_mem,
|
||||
OpenNebula.Helper.resource_state("host_simple",host.STATE),
|
||||
state_simple,
|
||||
host.IM_MAD,
|
||||
host.VM_MAD,
|
||||
pretty_time(host.LAST_MON_TIME)
|
||||
@@ -694,21 +719,40 @@ function addHostElement(request,host_json){
|
||||
function updateHostsView (request,host_list){
|
||||
var host_list_array = [];
|
||||
|
||||
on_hosts = 0;
|
||||
off_hosts = 0;
|
||||
error_hosts = 0;
|
||||
|
||||
$.each(host_list,function(){
|
||||
//Grab table data from the host_list
|
||||
host_list_array.push(hostElementArray(this));
|
||||
});
|
||||
|
||||
SunstoneMonitoring.monitor('HOST', host_list)
|
||||
|
||||
//if clusters_sel is there, it means the clusters have arrived.
|
||||
//Otherwise do not attempt to monitor them.
|
||||
if (typeof(monitorClusters) != 'undefined' && clusters_sel())
|
||||
monitorClusters(host_list)
|
||||
updateView(host_list_array,dataTable_hosts);
|
||||
updateHostSelect();
|
||||
|
||||
$("#total_hosts", $dashboard).text(host_list.length);
|
||||
$("#on_hosts", $dashboard).text(on_hosts);
|
||||
$("#off_hosts", $dashboard).text(off_hosts);
|
||||
$("#error_hosts", $dashboard).text(error_hosts);
|
||||
|
||||
var form_hosts = $("#form_hosts");
|
||||
|
||||
$("#total_hosts", form_hosts).text(host_list.length);
|
||||
$("#on_hosts", form_hosts).text(on_hosts);
|
||||
$("#off_hosts", form_hosts).text(off_hosts);
|
||||
$("#error_hosts", form_hosts).text(error_hosts);
|
||||
|
||||
|
||||
//SunstoneMonitoring.monitor('HOST', host_list)
|
||||
//
|
||||
////if clusters_sel is there, it means the clusters have arrived.
|
||||
////Otherwise do not attempt to monitor them.
|
||||
//if (typeof(monitorClusters) != 'undefined' && clusters_sel())
|
||||
// monitorClusters(host_list)
|
||||
|
||||
//dependency with the dashboard plugin
|
||||
updateInfraDashboard("hosts",host_list);
|
||||
//updateInfraDashboard("hosts",host_list);
|
||||
}
|
||||
|
||||
//Updates the host info panel tab content and pops it up
|
||||
@@ -942,7 +986,7 @@ $(document).ready(function(){
|
||||
});
|
||||
|
||||
$('#hosts_search').keyup(function(){
|
||||
dataTable_templates.fnFilter( $(this).val() );
|
||||
dataTable_hosts.fnFilter( $(this).val() );
|
||||
})
|
||||
|
||||
//preload it
|
||||
|
||||
@@ -20,9 +20,16 @@ var images_tab_content = '\
|
||||
<form class="custom" id="image_form" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-upload"></i> '+tr("Images")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_images"/> <small>'+tr("TOTAL")+'</small> <span id="size_images"/> <small>'+tr("SIZE")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -571,6 +578,8 @@ function imageElementArray(image_json){
|
||||
//Changing this? It may affect to the is_persistent() functions.
|
||||
var image = image_json.IMAGE;
|
||||
|
||||
size_images = size_images + parseInt(image.SIZE);
|
||||
|
||||
//add also persistent/non-persistent selects, type select.
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="image_'+image.ID+'" name="selected_items" value="'+image.ID+'"/>',
|
||||
@@ -611,12 +620,24 @@ function addImageElement(request, image_json){
|
||||
function updateImagesView(request, images_list){
|
||||
var image_list_array = [];
|
||||
|
||||
size_images = 0;
|
||||
|
||||
$.each(images_list,function(){
|
||||
image_list_array.push(imageElementArray(this));
|
||||
});
|
||||
|
||||
updateView(image_list_array,dataTable_images);
|
||||
updateVResDashboard("images",images_list);
|
||||
|
||||
var size = humanize_size_from_mb(size_images)
|
||||
|
||||
$("#total_images", $dashboard).text(images_list.length);
|
||||
$("#size_images", $dashboard).text(size);
|
||||
|
||||
var form = $("#image_form");
|
||||
|
||||
$("#total_images", form).text(images_list.length);
|
||||
$("#size_images", form).text(size);
|
||||
}
|
||||
|
||||
// Callback to update the information panel tabs and pop it up
|
||||
|
||||
@@ -45,9 +45,16 @@ var users_tab_content = '\
|
||||
<form class="custom" id="user_form" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-user"></i> '+tr("Users")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_users"/> <small>'+tr("TOTAL")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -599,15 +606,21 @@ function updateUsersView(request,users_list){
|
||||
var user_list_array = [];
|
||||
|
||||
$.each(users_list,function(){
|
||||
if (this.USER.ID == uid)
|
||||
dashboardQuotasHTML(this.USER);
|
||||
//if (this.USER.ID == uid)
|
||||
// dashboardQuotasHTML(this.USER);
|
||||
user_list_array.push(userElementArray(this));
|
||||
});
|
||||
updateView(user_list_array,dataTable_users);
|
||||
SunstoneMonitoring.monitor('USER', users_list)
|
||||
if (mustBeAdmin())
|
||||
updateSystemDashboard("users",users_list);
|
||||
//SunstoneMonitoring.monitor('USER', users_list)
|
||||
//if (mustBeAdmin())
|
||||
// updateSystemDashboard("users",users_list);
|
||||
updateUserSelect();
|
||||
|
||||
$("#total_users", $dashboard).text(users_list.length);
|
||||
|
||||
var form = $("#user_form");
|
||||
|
||||
$("#total_users", form).text(users_list.length);
|
||||
};
|
||||
|
||||
function updateUserInfo(request,user){
|
||||
|
||||
@@ -64,9 +64,16 @@ var vms_tab_content = '\
|
||||
<form class="custom" id="virtualMachine_list" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-cloud"></i> '+tr("Virtual Machines")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_vms"/> <small>'+tr("TOTAL")+'</small> <span id="active_vms"/> <small>'+tr("ACTIVE")+'</small> <span id="off_vms"/> <small>'+tr("OFF")+'</small> <span id="pending_vms"/> <small>'+tr("PENDING")+'</small> <span id="failed_vms"/> <small>'+tr("FAILED")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -829,10 +836,33 @@ function vMachineElementArray(vm_json){
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
switch (state) {
|
||||
case tr("INIT"):
|
||||
case tr("PENDING"):
|
||||
case tr("HOLD"):
|
||||
pending_vms++;
|
||||
break;
|
||||
case tr("FAILED"):
|
||||
failed_vms++;
|
||||
break;
|
||||
case tr("ACTIVE"):
|
||||
active_vms++;
|
||||
break;
|
||||
case tr("STOPPED"):
|
||||
case tr("SUSPENDED"):
|
||||
case tr("POWEROFF"):
|
||||
off_vms++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (state == tr("ACTIVE")) {
|
||||
state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
|
||||
};
|
||||
|
||||
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="vm_'+vm.ID+'" name="selected_items" value="'+vm.ID+'"/>',
|
||||
vm.ID,
|
||||
@@ -879,13 +909,31 @@ function addVMachineElement(request,vm_json){
|
||||
function updateVMachinesView(request, vmachine_list){
|
||||
var vmachine_list_array = [];
|
||||
|
||||
active_vms = 0;
|
||||
pending_vms = 0;
|
||||
failed_vms = 0;
|
||||
off_vms = 0;
|
||||
|
||||
$.each(vmachine_list,function(){
|
||||
vmachine_list_array.push( vMachineElementArray(this));
|
||||
});
|
||||
|
||||
updateView(vmachine_list_array,dataTable_vMachines);
|
||||
SunstoneMonitoring.monitor('VM', vmachine_list)
|
||||
updateVResDashboard("vms",vmachine_list);
|
||||
//SunstoneMonitoring.monitor('VM', vmachine_list)
|
||||
//updateVResDashboard("vms",vmachine_list);
|
||||
|
||||
$("#total_vms", $dashboard).text(vmachine_list.length);
|
||||
$("#active_vms", $dashboard).text(active_vms);
|
||||
$("#pending_vms", $dashboard).text(pending_vms);
|
||||
$("#failed_vms", $dashboard).text(failed_vms);
|
||||
|
||||
var form = $("#virtualMachine_list");
|
||||
|
||||
$("#total_vms", form).text(vmachine_list.length);
|
||||
$("#active_vms", form).text(active_vms);
|
||||
$("#pending_vms", form).text(pending_vms);
|
||||
$("#failed_vms", form).text(failed_vms);
|
||||
$("#off_vms", form).text(off_vms);
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -20,9 +20,16 @@ var vnets_tab_content = '\
|
||||
<form class="custom" id="virtualNetworks_form" action="">\
|
||||
<div class="panel">\
|
||||
<div class="row">\
|
||||
<div class="twelve columns">\
|
||||
<div class="six columns">\
|
||||
<h4 class="subheader"><i class="icon-sitemap"></i> '+tr("Virtual Networks")+'</h4>\
|
||||
</div>\
|
||||
<div class="six columns">\
|
||||
<div class="row dashboard right">\
|
||||
<div class="twelve columns">\
|
||||
<h4 class="subheader"><span id="total_vnets"/> <small>'+tr("TOTAL")+'</small> <span id="addresses_vnets"/> <small>'+tr("ADDRESSES")+'</small></h4>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="row">\
|
||||
<div class="nine columns">\
|
||||
@@ -672,6 +679,8 @@ function vnShow(req){
|
||||
function vNetworkElementArray(vn_json){
|
||||
var network = vn_json.VNET;
|
||||
|
||||
addresses_vnets = addresses_vnets + parseInt(network.TOTAL_LEASES);
|
||||
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="vnetwork_'+network.ID+'" name="selected_items" value="'+network.ID+'"/>',
|
||||
network.ID,
|
||||
@@ -711,14 +720,23 @@ function addVNetworkElement(request,vn_json){
|
||||
function updateVNetworksView(request, network_list){
|
||||
var network_list_array = [];
|
||||
|
||||
addresses_vnets = 0;
|
||||
|
||||
$.each(network_list,function(){
|
||||
network_list_array.push(vNetworkElementArray(this));
|
||||
});
|
||||
|
||||
updateView(network_list_array,dataTable_vNetworks);
|
||||
//dependency with dashboard
|
||||
updateInfraDashboard("vnets",network_list);
|
||||
//updateInfraDashboard("vnets",network_list);
|
||||
|
||||
$("#total_vnets", $dashboard).text(network_list.length);
|
||||
$("#addresses_vnets", $dashboard).text(addresses_vnets);
|
||||
|
||||
var form = $("#virtualNetworks_form");
|
||||
|
||||
$("#total_vnets", form).text(network_list.length);
|
||||
$("#addresses_vnets", form).text(addresses_vnets);
|
||||
}
|
||||
|
||||
//updates the information panel tabs and pops the panel up
|
||||
|
||||
@@ -104,6 +104,26 @@ function humanize_size(value,from_bytes) {
|
||||
return st;
|
||||
}
|
||||
|
||||
function humanize_size_from_mb(value) {
|
||||
if (typeof(value) === "undefined") {
|
||||
value = 0;
|
||||
}
|
||||
var binarySufix = ["MB", "GB", "TB" ];
|
||||
var i=0;
|
||||
while (value > 1024 && i < 3){
|
||||
value = value / 1024;
|
||||
i++;
|
||||
}
|
||||
value = Math.round(value * 10) / 10;
|
||||
|
||||
if (value - Math.round(value) == 0) {
|
||||
value = Math.round(value);
|
||||
}
|
||||
|
||||
var st = value + binarySufix[i];
|
||||
return st;
|
||||
}
|
||||
|
||||
//Wrapper to add an element to a dataTable
|
||||
function addElement(element,dataTable){
|
||||
dataTable.fnAddData(element);
|
||||
|
||||
@@ -603,7 +603,7 @@ form.creation {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.dashboard h1.subheader {
|
||||
.dashboard h2.subheader {
|
||||
margin-bottom: 0;
|
||||
margin-top: 0;
|
||||
}
|
||||
@@ -612,10 +612,18 @@ form.creation {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.dashboard h3.subheader {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
ul.button-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.value_td {
|
||||
text-overflow:ellipsis;
|
||||
}
|
||||
|
||||
small {
|
||||
color: rgb(182, 182, 182) !important;
|
||||
}
|
||||
Reference in new issue
Block a user