diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp
index 1739707555c..4743129db16 100644
--- a/ui/new/jsp/account.jsp
+++ b/ui/new/jsp/account.jsp
@@ -39,7 +39,7 @@
+
diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp
index 729bb5779b0..c8d11d0cef1 100644
--- a/ui/new/jsp/volume.jsp
+++ b/ui/new/jsp/volume.jsp
@@ -24,32 +24,38 @@
<%=t.t("Details")%>
-
+
+
diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js
index 3320136ce17..f11407cb226 100644
--- a/ui/new/scripts/cloud.core2.account.js
+++ b/ui/new/scripts/cloud.core2.account.js
@@ -14,8 +14,8 @@ function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
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.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
+ $midmenuItem1.find("#second_row").text(fromdb(jsonObj.domain).substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 23ea90889b9..a5b31d2e88e 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -349,22 +349,6 @@ function clickInstanceGroupHeader($arrowIcon) {
});
}
- function vmClearRightPanel(jsonObj) {
- $rightPanelHeader.find("#vm_name").text("");
- updateVirtualMachineStateInRightPanel("");
- $rightPanelContent.find("#ipAddress").text("");
- $rightPanelContent.find("#zoneName").text("");
- $rightPanelContent.find("#templateName").text("");
- $rightPanelContent.find("#serviceOfferingName").text("");
- $rightPanelContent.find("#ha").hide();
- $rightPanelContent.find("#created").text("");
- $rightPanelContent.find("#account").text("");
- $rightPanelContent.find("#domain").text("");
- $rightPanelContent.find("#hostName").text("");
- $rightPanelContent.find("#group").text("");
- $rightPanelContent.find("#iso").hide();
- }
-
function vmToRightPanel($midmenuItem) {
//details tab
if($midmenuItem.find("#info_icon").css("display") != "none") {
@@ -418,6 +402,22 @@ function clickInstanceGroupHeader($arrowIcon) {
}
});
}
+
+ function vmClearRightPanel(jsonObj) {
+ $rightPanelHeader.find("#vm_name").text("");
+ updateVirtualMachineStateInRightPanel("");
+ $rightPanelContent.find("#ipAddress").text("");
+ $rightPanelContent.find("#zoneName").text("");
+ $rightPanelContent.find("#templateName").text("");
+ $rightPanelContent.find("#serviceOfferingName").text("");
+ $rightPanelContent.find("#ha").hide();
+ $rightPanelContent.find("#created").text("");
+ $rightPanelContent.find("#account").text("");
+ $rightPanelContent.find("#domain").text("");
+ $rightPanelContent.find("#hostName").text("");
+ $rightPanelContent.find("#group").text("");
+ $rightPanelContent.find("#iso").hide();
+ }
//***** declaration for volume tab (begin) *********************************************************
var vmVolumeActionMap = {
diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js
index 21cb70e19ff..afeb6cba90d 100644
--- a/ui/new/scripts/cloud.core2.ipaddress.js
+++ b/ui/new/scripts/cloud.core2.ipaddress.js
@@ -10,15 +10,12 @@ function ipToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
$midmenuItem1.find("#first_row").text(jsonObj.ipaddress.substring(0,25));
- $midmenuItem1.find("#second_row").text(jsonObj.account.substring(0,25));
+ $midmenuItem1.find("#second_row").text(fromdb(jsonObj.account).substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}
function ipToRigntPanel($midmenuItem) {
var jsonObj = $midmenuItem.data("jsonObj");
- var $rightPanelContent = $("#right_panel_content");
- //$rightPanelContent.find("#type").text(jsonObj.type);
- //$rightPanelContent.find("#description").text(jsonObj.description);
- //setDateField(jsonObj.sent, $rightPanelContent.find("#sent"));
+ var $rightPanelContent = $("#right_panel_content");
}
\ No newline at end of file
diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index be68637013b..120705d00ec 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -9,8 +9,8 @@ function isoToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon"));
- $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
- $midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25));
+ $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
+ $midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}
diff --git a/ui/new/scripts/cloud.core2.snapshot.js b/ui/new/scripts/cloud.core2.snapshot.js
index eedc2eba2cb..8c916a2b72c 100644
--- a/ui/new/scripts/cloud.core2.snapshot.js
+++ b/ui/new/scripts/cloud.core2.snapshot.js
@@ -9,8 +9,8 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
- $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
- $midmenuItem1.find("#second_row").text(jsonObj.volumename.substring(0,25));
+ $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
+ $midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index 23e2545d415..0bf5a65b929 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -16,8 +16,8 @@ function templateToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
else if(jsonObj.level == "WARN")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
- $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
- $midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25));
+ $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
+ $midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}
diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index de225990fcf..1c0a5354c9c 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -29,7 +29,7 @@ function volumeToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png");
- $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
+ $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
}