[Hyperic-hq-discuss] hq r3670 - in trunk: src/org/hyperic/hq/ui/json/action/escalation/finder web/js web/portlet/criticalAlerts web/resource/hub

[<he...@hy...>]

Author: heather
Date: 2007-03-08 14:20:34 -0800 (Thu, 08 Mar 2007)
New Revision: 3670
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3670

Modified:
   trunk/src/org/hyperic/hq/ui/json/action/escalation/finder/ListActiveEscalations.java
   trunk/web/js/listWidget.js
   trunk/web/js/requests.js
   trunk/web/portlet/criticalAlerts/View.jsp
   trunk/web/resource/hub/ResourceHub.jsp
Log:
removing a border in the resourcehub.so page/Users/snott/dev/hq/web/resource/hub/ResourceHub.jsp

Modified: trunk/src/org/hyperic/hq/ui/json/action/escalation/finder/ListActiveEscalations.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/json/action/escalation/finder/ListActiveEscalations.java	2007-03-08 21:41:23 UTC (rev 3669)
+++ trunk/src/org/hyperic/hq/ui/json/action/escalation/finder/ListActiveEscalations.java	2007-03-08 22:20:34 UTC (rev 3670)
@@ -90,7 +90,7 @@
         
         JSONObject res = new JSONObject();
         
-        res.put("summary", resArr);
+        res.put("escSummary", resArr);
         ctx.setJSONResult(new JSONResult(res));
     }
 }

Modified: trunk/web/js/listWidget.js
===================================================================
--- trunk/web/js/listWidget.js	2007-03-08 21:41:23 UTC (rev 3669)
+++ trunk/web/js/listWidget.js	2007-03-08 22:20:34 UTC (rev 3670)
@@ -379,8 +379,8 @@
 	if (e.checked) {
 		CheckAll(e, widgetInstanceName, subGroup);
 		ToggleButtons(widgetInstanceName, prefix, isRemove, e.form);
-
-    } else {
+	}
+	else {
 		ClearAll(e, widgetInstanceName, subGroup);
 		ToggleButtons(widgetInstanceName, prefix, isRemove, e.form);
 	}

Modified: trunk/web/js/requests.js
===================================================================
--- trunk/web/js/requests.js	2007-03-08 21:41:23 UTC (rev 3669)
+++ trunk/web/js/requests.js	2007-03-08 22:20:34 UTC (rev 3670)
@@ -230,6 +230,7 @@
         var token = alertText.token;
         var alertTable;
         var alertFunc;
+        unCheck();
 
         if (alertText.token != null) {
             alertTable = document.getElementById('recentAlertsTable' + token);
@@ -360,6 +361,8 @@
 
         $('modifiedCritTime' + (token != null ? token : '')).innerHTML =
         'Updated: ' + refreshTime();
+        
+
         //rTimer = setTimeout(alertFunc, 60000);
         // Refresh in 60 seconds
     }
@@ -754,4 +757,15 @@
 
 function reportError(originalRequest) {
     alert('Error ' + originalRequest.status + ' -- ' + originalRequest.statusText);
+}
+
+function unCheck() {
+
+        for(i=0; i<document.FixAlertsForm.elements.length; i++) {
+            if(document.FixAlertsForm.elements[i].type=="checkbox") {
+            document.FixAlertsForm.elements[i].checked=false;
+            }
+            $('listToggleAll').checked=false;
+       }
+
 }
\ No newline at end of file

Modified: trunk/web/portlet/criticalAlerts/View.jsp
===================================================================
--- trunk/web/portlet/criticalAlerts/View.jsp	2007-03-08 21:41:23 UTC (rev 3669)
+++ trunk/web/portlet/criticalAlerts/View.jsp	2007-03-08 22:20:34 UTC (rev 3670)
@@ -44,6 +44,13 @@
 function requestRecentAlerts<c:out value="${portlet.token}"/>() {
 	var critAlertUrl = "<html:rewrite page="/dashboard/ViewCriticalAlerts.do?token=${portlet.token}"/>"
 	new Ajax.Request(critAlertUrl, {method: 'get', onSuccess:showRecentAlerts, onFailure :reportError});
+
+    for (var f = 0; f < document.FixAlertsForm.elements.length; f++) {
+            if (document.FixAlertsForm.elements[i].type == 'submit' && document.FixAlertsForm.elements[i].className == 'CompactButton') {
+                document.FixAlertsForm.elements[i].disabled = true;
+                document.FixAlertsForm.elements[i].className = 'CompactButtonInactive';
+            }
+     }
 }
 
 onloads.push(requestRecentAlerts<c:out value="${portlet.token}"/>);
@@ -54,9 +61,9 @@
     var pars = eid + "&a=" + aid;
     var url = ackAlertUrl + pars;
     new Ajax.Request(url);
-
 }
 
+
 </script>
 <c:set var="rssUrl" value="/rss/ViewCriticalAlerts.rss"/>
 

Modified: trunk/web/resource/hub/ResourceHub.jsp
===================================================================
--- trunk/web/resource/hub/ResourceHub.jsp	2007-03-08 21:41:23 UTC (rev 3669)
+++ trunk/web/resource/hub/ResourceHub.jsp	2007-03-08 22:20:34 UTC (rev 3670)
@@ -385,7 +385,7 @@
     </display:table>
     </c:when>
     <c:otherwise>
-    <table class="table" width="100%" border="1" cellspacing="0" cellpadding="0">
+    <table class="table" width="100%" border="0" cellspacing="0" cellpadding="0">
     <tr class="tableRowHeader">
 
     <th width="1%" class="ListHeaderCheckbox"><input type="checkbox" onclick="ToggleAll(this, widgetProperties)" name="listToggleAll"></th>