diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 6438c247731..ec9044531c5 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -1,5 +1,24 @@ -function loadAccountToRigntPanelFn($rightPanelContent) { - var jsonObj = $rightPanelContent.data("jsonObj"); +function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.data("jsonObj", jsonObj); + + var iconContainer = $midmenuItem1.find("#icon_container").show(); + if (jsonObj.accounttype == roleTypeUser) + iconContainer.find("#icon").attr("src", "images/midmenuicon_account_user.png"); + else if (jsonObj.accounttype == roleTypeAdmin) + iconContainer.find("#icon").attr("src", "images/midmenuicon_account_admin.png"); + else if (jsonObj.accounttype == roleTypeDomainAdmin) + iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png"); + + $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); + $midmenuItem1.find("#second_row").text(jsonObj.domain.substring(0,25)); + $midmenuItem1.data("toRightPanelFn", toRightPanelFn); +} + +function accountToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + var $rightPanelContent = $("#right_panel_content"); $rightPanelContent.find("#role").text(toRole(jsonObj.accounttype)); $rightPanelContent.find("#account").text(fromdb(jsonObj.name)); diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 76d488b0991..04ede572047 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -1,10 +1,17 @@ -function loadAlertToRigntPanelFn($rightPanelContent) { - var jsonObj = $rightPanelContent.data("jsonObj"); - - var $rightPanelContent = $("#right_panel_content"); +function alertToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.data("jsonObj", jsonObj); + $midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25)); + $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); + $midmenuItem1.data("toRightPanelFn", toRightPanelFn); +} + +function alertToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + var $rightPanelContent = $("#right_panel_content"); $rightPanelContent.find("#type").text(jsonObj.type); - $rightPanelContent.find("#description").text(jsonObj.description); - + $rightPanelContent.find("#description").text(jsonObj.description); setDateField(jsonObj.sent, $rightPanelContent.find("#sent")); } \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index 72c54960e9c..d5bac6ebabf 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -1,5 +1,24 @@ -function loadEventToRigntPanelFn($rightPanelContent) { - var jsonObj = $rightPanelContent.data("jsonObj"); +function eventToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.data("jsonObj", jsonObj); + + var iconContainer = $midmenuItem1.find("#icon_container").show(); + if(jsonObj.level == "INFO") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); + else if(jsonObj.level == "ERROR") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); + else if(jsonObj.level == "WARN") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); + + $midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25)); + $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); + $midmenuItem1.data("toRightPanelFn", toRightPanelFn); +} + +function eventToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + var $rightPanelContent = $("#right_panel_content"); $rightPanelContent.find("#username").text(fromdb(jsonObj.username)); $rightPanelContent.find("#account").text(fromdb(jsonObj.account)); diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index e2d12c5e167..ef134d0376d 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -58,7 +58,7 @@ $(document).ready(function() { } var $midmenuItem = $("#midmenu_item"); - function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, propertyForFirstRow, propertyForSecondRow, rightPanelJSP, toRightPanelFn) { + function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, toMidmenu, toRightPanel) { $("#"+leftmenuId).bind("click", function(event) { $("#right_panel").load(rightPanelJSP); @@ -72,10 +72,9 @@ $(document).ready(function() { var items = json[jsonResponse1][jsonResponse2]; if(items != null && items.length > 0) { - for(var i=0; i