Updated web interface to reinstate alert counts, and implement a working search box.

1 files changed, 4 insertions, 7 deletions

diff --git a/views/_navbar.haml b/views/_navbar.haml
index 8b16c55..bd23308 100644
--- a/views/_navbar.haml
+++ b/views/_navbar.haml
@@ -6,18 +6,15 @@
       %li{:class => [ @alert_type == "raised" && "nav_selected"]}
         %a{:href => '/alerts/raised/'+@group_by} 
           Raised (
-          %span#count_raised><= @alerts_raised.length
+          %span#count_raised><= @alert_counts[:unacknowledged]
           )
       %li{:class => [ @alert_type == "acknowledged" && "nav_selected"]}
         %a{:href => '/alerts/acknowledged/'+@group_by} 
           Ack'd (
-          %span#count_ackd><= @alerts_ackd.length
-          )
-      %li{:class => [ @alert_type == "cleared" && "nav_selected"]}
-        %a{:href => '/alerts/cleared/'+@group_by} 
-          Cleared (
-          %span#count_cleared><= @alerts_cleared.length
+          %span#count_ackd><= @alert_counts[:acknowledged]
           )
+      %li{:class => [ request.path_info =~ /^\/search/ && "nav_selected"]}
+        %a{:href => '/search'} Search
       %li{:class => [ request.path_info =~ /^\/events/ && "nav_selected"]}
         %a{:href => '/events/calendar'} Events
       %li