From 4e10a97c876279415bcc0af319dfc5e4ed4d3690 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 4 Jan 2011 10:56:13 -0800 Subject: [PATCH] bug 7610: dashboard page (admin) - General Alerts - clicking "More" icon will redirect to Alerts page. --- ui/jsp/dashboard.jsp | 8 ++++---- ui/scripts/cloud.core.dashboard.js | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ui/jsp/dashboard.jsp b/ui/jsp/dashboard.jsp index 2457ab2d6c8..5762649dc24 100644 --- a/ui/jsp/dashboard.jsp +++ b/ui/jsp/dashboard.jsp @@ -193,7 +193,7 @@ -
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -221,7 +221,7 @@
-
+
diff --git a/ui/scripts/cloud.core.dashboard.js b/ui/scripts/cloud.core.dashboard.js index d9f3e94d2d1..5ae33d052ef 100644 --- a/ui/scripts/cloud.core.dashboard.js +++ b/ui/scripts/cloud.core.dashboard.js @@ -181,7 +181,8 @@ function afterLoadDashboardJSP() { }); }); $thisTab.find("#capacity_zone_select").change(); - + + // General Alerts $.ajax({ data: createURL("command=listAlerts"), dataType: "json", @@ -200,6 +201,12 @@ function afterLoadDashboardJSP() { } } }); + + $("#general_alerts").find("#more_icon").unbind("click").bind("click", function(event) { + $("#leftmenu_events").click(); + $("#leftmenu_alert").click(); + return false; + }); // Hosts Alerts $.ajax({