From 424400d2b9e4c57096f718cd13d6185de002def2 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 9 Nov 2010 15:17:22 -0800 Subject: [PATCH] bug 6983: function drawBarChart() is used by both instance page and host page. So, move it to cloud.core.js. --- ui/scripts/cloud.core.instance.js | 23 +---------------------- ui/scripts/cloud.core.js | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 091fa6316be..c5087888ab4 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1460,28 +1460,7 @@ function vmJsonToStatisticsTab() { $thisTab.find("#tab_spinning_wheel").hide(); $thisTab.find("#tab_container").show(); } - -function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having % inside) - $capacity.find("#percentused").text(percentused); - - var percentusedFloat; - if(percentused.indexOf("%") != -1) { - percentused = percentused.replace("%", ""); - percentusedFloat = parseFloat(percentused); - percentusedFloat = percentusedFloat * 0.01; //because % is removed. percentusedFloat == 0.0001 - } - else { - percentusedFloat = parseFloat(percentused); - } - - if (percentusedFloat <= 0.6) - $capacity.find("#bar_chart").removeClass().addClass("db_barbox low").css("width", percentused); - else if (percentusedFloat > 0.6 && percentusedFloat <= 0.8 ) - $capacity.find("#bar_chart").removeClass().addClass("db_barbox mid").css("width", percentused); - else if (percentusedFloat > 0.8 ) - $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused); -} - + function vmJsonToRouterTab() { var $thisTab = $("#right_panel_content #tab_content_router"); $thisTab.find("#tab_container").hide(); diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index bbecd864db8..0b218fb42ce 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -1023,7 +1023,28 @@ function showLeftNavigationBasedOnRole() { else{ //isUser() == true } } - + +function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having % inside) + $capacity.find("#percentused").text(percentused); + + var percentusedFloat; + if(percentused.indexOf("%") != -1) { + percentused = percentused.replace("%", ""); + percentusedFloat = parseFloat(percentused); + percentusedFloat = percentusedFloat * 0.01; //because % is removed. percentusedFloat == 0.0001 + } + else { + percentusedFloat = parseFloat(percentused); + } + + if (percentusedFloat <= 0.6) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox low").css("width", percentused); + else if (percentusedFloat > 0.6 && percentusedFloat <= 0.8 ) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox mid").css("width", percentused); + else if (percentusedFloat > 0.8 ) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused); +} +