From c7790d73ff577d6fdc17833b8321b6c5d5f2b442 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 2 Oct 2010 12:38:49 -0700 Subject: [PATCH] new UI - dashboard of user - implement Resources section, My Account section. --- ui/new/jsp/dashboard.jsp | 14 +++--- ui/new/scripts/cloud.core2.dashboard.js | 67 +++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 8d5fdf2bc0a..4f4c7df5b84 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -269,7 +269,7 @@
- 24 VM(s)
+ ? VM(s)
@@ -287,7 +287,7 @@
- 24 VM(s)
+ ? VM(s)
@@ -305,7 +305,7 @@
- 48 VM(s)
+ ? VM(s)
@@ -422,7 +422,7 @@
- 3
+
@@ -432,7 +432,7 @@
- Niki
+
@@ -442,7 +442,7 @@
- User
+
@@ -452,7 +452,7 @@
- Root
+
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index aa9c28b777b..b4f8deb2985 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -210,6 +210,73 @@ function afterLoadDashboardJSP() { } else if(isUser()) { showDashboard("dashboard_user"); + + //$("#launch_test").hide(); + $.ajax({ + cache: false, + data: createURL("command=listAccounts"), + dataType: "json", + success: function(json) { + var accounts = json.listaccountsresponse.account; + if (accounts != null && accounts.length > 0) { + var statJSON = accounts[0]; + /* + var sent = parseInt(statJSON.sentbytes); + var rec = parseInt(statJSON.receivedbytes); + + if(sent==0 && rec==0) + $("#network_bandwidth_panel").hide(); + else + $("#network_bandwidth_panel").show(); + + $("#menutab_role_user").show(); + $("#menutab_role_root").hide(); + $("#menutab_role_domain").hide(); + $("#tab_dashboard_user").show(); + $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide(); + + // This is in bytes, so let's change to KB + sent = Math.round(sent / 1024); + rec = Math.round(rec / 1024); + $("#db_sent").text(sent + "KB"); + $("#db_received").text(rec + "KB"); + $("#db_available_public_ips").text(statJSON.ipavailable); + $("#db_owned_public_ips").text(statJSON.iptotal); + */ + $("#db_running_vms").text(statJSON.vmrunning); + $("#db_stopped_vms").text(statJSON.vmstopped); + $("#db_total_vms").text(statJSON.vmtotal); + //$("#db_avail_vms").text(statJSON.vmavailable); + $("#db_account_id").text(statJSON.id); + $("#db_account").text(statJSON.name); + $("#db_type").text(toRole(statJSON.accounttype)); + $("#db_domain").text(statJSON.domain); + } + + // Events + $.ajax({ + data: createURL("command=listEvents&level=ERROR"), + dataType: "json", + success: function(json) { + var events = json.listeventsresponse.event; + if (events != null && events.length > 0) { + var errorGrid = $("#error_grid_content").empty(); + var length = (events.length>=3) ? 3 : events.length; + for (var i = 0; i < length; i++) { + var errorTemplate = $("#recent_error_template").clone(true); + errorTemplate.find("#db_error_type").text(events[i].type); + errorTemplate.find("#db_error_msg").text(fromdb(events[i].description)); + setDateField(events[i].created, errorTemplate.find("#db_error_date")); + errorGrid.append(errorTemplate.show()); + } + } + } + }); + }, + beforeSend: function(XMLHttpRequest) { + return true; + } + }); } else { //no role logout(false);