From fb318f1ae38ede1b3928efd43335621d3efda5b7 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 23 Oct 2010 11:29:04 -0700 Subject: [PATCH] new UI - instance page - add action menu to details tab. --- ui/new/jsp/instance.jsp | 293 +++++++++++++------------ ui/new/jsp/snapshot.jsp | 5 +- ui/new/scripts/cloud.core2.instance.js | 1 + 3 files changed, 160 insertions(+), 139 deletions(-) diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp index e826901cb2f..20eda605f2e 100644 --- a/ui/new/jsp/instance.jsp +++ b/ui/new/jsp/instance.jsp @@ -30,147 +30,168 @@ <%=t.t("Routers")%> -
-
-
-
-
-
-
- -
+
+
+
+
-
-
+

+ Waiting …

+
+
+
+
+
Title
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+

+

+
+
+
+
+
+
+ <%=t.t("Zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("IP")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Template")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Service")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("HA.Enabled")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Created")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Domain")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Host")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("ISO.attached")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Group")%>:
+
+
+
-
-

-

-
-
-
- <%=t.t("Zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("IP")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Template")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Service")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("HA.Enabled")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Created")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Account")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Domain")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Host")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("ISO.attached")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Group")%>:
-
-
-
-
-
-
-
+
-
- +
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index f517571ac3c..f8bb4c3e9b9 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1248,6 +1248,7 @@ function vmJsonToDetailsTab(jsonObj, $midmenuItem){ $detailsTab.find("#zoneName").text(fromdb(jsonObj.zonename)); var vmName = getVmName(jsonObj.name, jsonObj.displayname); + $detailsTab.find("#title").text(vmName); $detailsTab.find("#vmname").text(vmName); $detailsTab.find("#ipaddress").text(fromdb(jsonObj.ipaddress));