diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 1f644ed8a25..c4195370346 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -63,7 +63,7 @@ label.menu.alerts=Alerts label.menu.system=System label.menu.physical.resources=Physical Resources label.menu.virtual.resources=Virtual Resources -label.menu.virtual.routers=Virtual Routers +label.menu.virtual.appliances=Virtual Appliances label.menu.system.vms=System VMs label.menu.configuration=Configuration label.menu.service.offerings=Service Offerings diff --git a/client/WEB-INF/classes/resources/messages_en.properties b/client/WEB-INF/classes/resources/messages_en.properties index 1f644ed8a25..c4195370346 100644 --- a/client/WEB-INF/classes/resources/messages_en.properties +++ b/client/WEB-INF/classes/resources/messages_en.properties @@ -63,7 +63,7 @@ label.menu.alerts=Alerts label.menu.system=System label.menu.physical.resources=Physical Resources label.menu.virtual.resources=Virtual Resources -label.menu.virtual.routers=Virtual Routers +label.menu.virtual.appliances=Virtual Appliances label.menu.system.vms=System VMs label.menu.configuration=Configuration label.menu.service.offerings=Service Offerings diff --git a/ui/index.jsp b/ui/index.jsp index 51ecc2c6cce..b8346afd1bd 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -772,7 +772,7 @@
-
+
@@ -840,10 +840,12 @@ diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index 6ce9d922f1c..f597df2966b 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -106,8 +106,10 @@ <%=t.t("Volumes")%>
<%=t.t("Statistics")%>
+
@@ -150,12 +152,13 @@

+
-
@@ -189,6 +192,7 @@
+ +
<%=t.t("Template")%>:
@@ -209,7 +214,7 @@
-
+
<%=t.t("Service")%>:
@@ -219,7 +224,7 @@
-
+
<%=t.t("HA.Enabled")%>:
@@ -233,7 +238,7 @@
-
+
<%=t.t("Created")%>:
@@ -243,7 +248,7 @@
-
+
<%=t.t("Account")%>:
@@ -253,7 +258,7 @@
-
+
<%=t.t("Domain")%>:
@@ -263,7 +268,7 @@
-
+
<%=t.t("Host")%>:
@@ -273,7 +278,7 @@
-
+
<%=t.t("ISO.attached")%>:
@@ -283,7 +288,7 @@
-
+
<%=t.t("Group")%>:
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp index 5ad1db0ba0e..d2a39eb5165 100644 --- a/ui/jsp/router.jsp +++ b/ui/jsp/router.jsp @@ -16,7 +16,7 @@ Routers

- Router + Virtual Appliance

@@ -55,24 +55,24 @@
-
-
-
-
-
- -
-
-
-
-
-
-

-

-
-
-
+
+
+
+
+
+ +
+
+
+
+
+
+

+

+
+
+
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index e4aa9d2f732..09a87fa3c7d 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1462,7 +1462,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); + $midmenuItem1.find("#second_row").text(jsonObj.templatename); updateVmStateInMidMenu(jsonObj, $midmenuItem1); $midmenuItem1.data("toRightPanelFn", vmToRightPanel);