From 9a0908ab28eb42801d019bdca1372c8fcada7f2f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 8 Nov 2010 21:26:01 -0800 Subject: [PATCH] new UI - virtual router page - show loading image before page is fully loaded. --- ui/jsp/router.jsp | 221 +++++++++++++++--------------- ui/scripts/cloud.core.router.js | 9 +- ui/scripts/cloud.core.snapshot.js | 2 +- 3 files changed, 120 insertions(+), 112 deletions(-) diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp index e69e1cb6136..1492f2d4026 100644 --- a/ui/jsp/router.jsp +++ b/ui/jsp/router.jsp @@ -29,140 +29,141 @@ <%=t.t("Details")%>
-
+ - -
-
-
(title)
- -
-
-
-

- Detaching Disk …

-
-
-
-
-
-
-
-
- -
-
-
-
+
+
+
+
(title)
+ +
+
+
+

+ Detaching Disk …

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+

+

+
+
+
+
+
+
+ <%=t.t("Zone")%>:
+
+
+
-
-

-

-
-
-
-
- <%=t.t("Zone")%>:
-
-
-
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Name")%>:
-
-
-
+
+
+
+ <%=t.t("Public IP")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Public IP")%>:
-
-
-
+
+
+
+ <%=t.t("Private IP")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Private IP")%>:
-
-
-
+
+
+
+ <%=t.t("Guest IP")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Guest IP")%>:
-
-
-
+
+
+
+ <%=t.t("Host")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Host")%>:
-
-
-
+
+
+
+ <%=t.t("Network Domain")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Network Domain")%>:
-
-
-
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Account")%>:
-
-
-
+
+
+
+ <%=t.t("Created")%>:
+
+
+
+
-
-
-
-
- <%=t.t("Created")%>:
-
-
-
-
-
-
+
diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js index 0fe8001db0b..db09ab7b356 100644 --- a/ui/scripts/cloud.core.router.js +++ b/ui/scripts/cloud.core.router.js @@ -41,6 +41,10 @@ function routerToRightPanel($midmenuItem1) { } function routerJsonToDetailsTab($midmenuItem1) { + var $thisTab = $("#right_panel_content #tab_content_details"); + $thisTab.find("#tab_container").hide(); + $thisTab.find("#tab_spinning_wheel").show(); + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); @@ -77,7 +81,10 @@ function routerJsonToDetailsTab($midmenuItem1) { if(noAvailableActions == true) { $actionMenu.find("#action_list").append($("#no_available_actions").clone().show()); } - //***** actions (end) ***** + //***** actions (end) ***** + + $thisTab.find("#tab_spinning_wheel").hide(); + $thisTab.find("#tab_container").show(); } var routerActionMap = { diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js index d26b5a21b72..c3bd084abb1 100644 --- a/ui/scripts/cloud.core.snapshot.js +++ b/ui/scripts/cloud.core.snapshot.js @@ -57,7 +57,7 @@ function snapshotToRightPanel($midmenuItem1) { } function snapshotJsonToDetailsTab() { - var $thisTab = $("#right_panel_content #tab_content_details"); + var $thisTab = $("#right_panel_content #tab_content_details"); $thisTab.find("#tab_container").hide(); $thisTab.find("#tab_spinning_wheel").show();