[Hyperic-hq-discuss] hq r7575 - in trunk: src/org/hyperic/hq/hqu/rendit_sys/html ui_plugins/systemsdown/views/systemsdown

[<rp...@hy...>]

Author: rpack
Date: 2008-01-16 13:20:17 -0800 (Wed, 16 Jan 2008)
New Revision: 7575
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7575

Modified:
   trunk/src/org/hyperic/hq/hqu/rendit_sys/html/DojoUtil.groovy
   trunk/ui_plugins/systemsdown/views/systemsdown/index.gsp
Log:
Fix for HHQ-1519. Changed the element ids to correspond with the page size and forced an update to the link styles onload.

Modified: trunk/src/org/hyperic/hq/hqu/rendit_sys/html/DojoUtil.groovy
===================================================================
--- trunk/src/org/hyperic/hq/hqu/rendit_sys/html/DojoUtil.groovy	2008-01-16 21:08:10 UTC (rev 7574)
+++ trunk/src/org/hyperic/hq/hqu/rendit_sys/html/DojoUtil.groovy	2008-01-16 21:20:17 UTC (rev 7575)
@@ -255,8 +255,9 @@
                 if(dojo.io.cookie.getCookie("filtercount")) {
                     currentCountFilter = dojo.byId(dojo.io.cookie.getCookie("filtercount"));
                 } else {
-                    currentCountFilter = dojo.byId("defaultCount");
+                    currentCountFilter = dojo.byId("50");
                 }
+                updateFilterCount(currentCountFilter.id, currentCountFilter);
                 plugin.ajax.bind("${params.updateURL}");
             });
             

Modified: trunk/ui_plugins/systemsdown/views/systemsdown/index.gsp
===================================================================
--- trunk/ui_plugins/systemsdown/views/systemsdown/index.gsp	2008-01-16 21:08:10 UTC (rev 7574)
+++ trunk/ui_plugins/systemsdown/views/systemsdown/index.gsp	2008-01-16 21:20:17 UTC (rev 7575)
@@ -6,13 +6,11 @@
 
     function updateFilterCount(count, obj) {
         if (currentCountFilter) {
-            if (currentCountFilter == obj) {
-                return;
-            }
             currentCountFilter.style.color = '#003399';
             currentCountFilter.style.cursor = 'pointer';
             currentCountFilter.style.fontWeight = 'bold';
-        }
+        }else
+            return;
         dojo.io.cookie.setCookie('filtercount', obj.id);
         currentCountFilter = obj;
         currentCountFilter.style.color = '#000000';
@@ -66,7 +64,7 @@
     </div>
     <div class="downTableContainer" id="downCont">
         <div id="systemsDownTable">
-        <%def headerHTML = '<div style="float: right; margin-top:5px;padding-right:15px;">Show Most Recent:&nbsp;<span id="defaultCount" onclick="updateFilterCount(50, this)">50</span>&nbsp;|&nbsp;<span id="onehundred" onclick="updateFilterCount(100,this)" class="countLinksActive">100</span>&nbsp;|&nbsp;<span id="onethousand"  onclick="updateFilterCount(1000,this)" class="countLinksActive">1000</span></div>'%>
+        <%def headerHTML = '<div style="float: right; margin-top:5px;padding-right:15px;">Show Most Recent:&nbsp;<span id="50" onclick="updateFilterCount(50, this)" class="countLinksActive">50</span>&nbsp;|&nbsp;<span id="100" onclick="updateFilterCount(100, this)" class="countLinksActive">100</span>&nbsp;|&nbsp;<span id="1000"  onclick="updateFilterCount(1000,this)" class="countLinksActive">1000</span></div>'%>
 
         <%= dojoTable(id:'SystemsDown', title:l.SystemsDownTitle,
             refresh:60, pageControls:false, url:urlFor(action:'data'),