diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index c795a72e95d..0a19ddcf45a 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1489,7 +1489,7 @@ function vmToMidmenu(jsonObj, $midmenuItem1) { var vmName = getVmName(jsonObj.name, jsonObj.displayname); $midmenuItem1.find("#first_row").text(vmName); $midmenuItem1.find("#second_row").text(jsonObj.ipaddress); - updateStateInMidMenu(jsonObj, $midmenuItem1); + updateVmStateInMidMenu(jsonObj, $midmenuItem1); $midmenuItem1.data("toRightPanelFn", vmToRightPanel); } diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index b31888e68fd..99d87c60242 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -725,7 +725,7 @@ function switchToTab(tabIndex, tabArray, tabContentArray, afterSwitchFnArray) { }); } -function updateStateInMidMenu(jsonObj, $midmenuItem1) { +function updateVmStateInMidMenu(jsonObj, $midmenuItem1) { if(jsonObj.state == "Running") $midmenuItem1.find("#icon").attr("src", "images/status_green.png"); else if(jsonObj.state == "Stopped") @@ -735,6 +735,17 @@ function updateStateInMidMenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#icon_container").show(); } + +function updateHostStateInMidMenu(jsonObj, $midmenuItem1) { + if(jsonObj.state == "Up" || jsonObj.state == "Connecting") + $midmenuItem1.find("#icon").attr("src", "images/status_green.png"); + else if(jsonObj.state == "Down" || jsonObj.state == "Alert") + $midmenuItem1.find("#icon").attr("src", "images/status_red.png"); + else //ErrorInMaintenance, PrepareForMaintenance, Maintenance, Disconnected + $midmenuItem1.find("#icon").attr("src", "images/status_gray.png"); + + $midmenuItem1.find("#icon_container").show(); +} function resetViewConsoleAction(jsonObj, $detailsTab) { var $viewConsoleContainer = $detailsTab.find("#view_console_container").empty(); //reset view console panel diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js index b0c1bcd9654..a86fa76e19c 100644 --- a/ui/new/scripts/cloud.core2.resource.js +++ b/ui/new/scripts/cloud.core2.resource.js @@ -648,6 +648,8 @@ function hostToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.ipaddress.substring(0,25)); + + updateHostStateInMidMenu(jsonObj, $midmenuItem1); } function hostToRightPanel($midmenuItem1) { diff --git a/ui/new/scripts/cloud.core2.router.js b/ui/new/scripts/cloud.core2.router.js index 466ea2cf2b0..310d7aa09ec 100644 --- a/ui/new/scripts/cloud.core2.router.js +++ b/ui/new/scripts/cloud.core2.router.js @@ -26,7 +26,7 @@ function routerToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.publicip.substring(0,25)); - updateStateInMidMenu(jsonObj, $midmenuItem1); + updateVmStateInMidMenu(jsonObj, $midmenuItem1); } function routerAfterDetailsTabAction(json, $midmenuItem1, id) {