prewikka/master: Make a click on the 'filtered' notice show the inline filter popup.

commit ac96ac57a9007f96965a64236385b7d79984587a
Author: Yoann Vandoorselaere <[email protected]>
Date:   Tue Jun 2 12:00:04 2009 +0200

    Make a click on the 'filtered' notice show the inline filter popup.


========================================

 htdocs/css/style.css                   |    4 ++-
 prewikka/templates/AlertListing.tmpl   |   34 ++++++++++++++-----------------
 prewikka/templates/MessageListing.tmpl |    2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

========================================

diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index b1c4dd4..de41ad3 100755
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -986,9 +986,11 @@ p {
        font-weight: bold;
        color: red;
        display: inline;
-       float: right;
 }
 
+span.filter_enabled_marker {
+	float: right;
+}
 
 
 .message_summary_no_border, .message_summary_no_border tr, .message_summary_no_border td, .message_summary_no_border th {
diff --git a/prewikka/templates/AlertListing.tmpl b/prewikka/templates/AlertListing.tmpl
index fe954e5..68eb713 100644
--- a/prewikka/templates/AlertListing.tmpl
+++ b/prewikka/templates/AlertListing.tmpl
@@ -589,11 +589,11 @@ function ${type}_set_filter_saved() {
 #end def
 
 #def filter_enabled_marker($type)
-  <span style="float:right;">
+  <span class="filter_enabled_marker filter_popup_link">
    #if $type == 2
-    <span class="filter_enabled_marker">[$_("filtered")]</span>
+    [<a class="filter_enabled_marker">$_("filtered")</a>]
    #else
-    <span class="filter_enabled_marker" style="color: gray;">[$_("filtered")]</span>
+    [<a style="color: gray;">$_("filtered")</a>]
    #end if
   </span>
 #end def
@@ -617,6 +617,9 @@ function ${type}_set_filter_saved() {
  <tr style="height: 20px;">
   <th class="filter_popup">
    <a class="filter_popup_link">$_("Classification")</a>
+    #if $classification_filtered
+     $filter_enabled_marker($classification_filtered)
+    #end if
    <div id="classification">
     <table>
      <tr><td>$define_inline_filter("classification", "alert.classification.text")</td></tr>
@@ -663,29 +666,27 @@ function ${type}_set_filter_saved() {
      $filter_reset()
     </table>
     </div>
-
-    #if $classification_filtered
-     $filter_enabled_marker($classification_filtered)
-    #end if
   </th>
 
   <th class="filter_popup">
    <a class="filter_popup_link">$_("Source")</a>
+   #if $source_filtered
+     $filter_enabled_marker($source_filtered)
+   #end if
    <div id="source">
     <table>
      <tr><td>$define_inline_filter("source", "alert.source.node.address.address")</td></tr>
      <tr><td>$define_inline_aggreg("source")</td></tr>
      $filter_reset()
     </table>
-
    </div>
-   #if $source_filtered
-     $filter_enabled_marker($source_filtered)
-   #end if
   </th>
 
   <th class="filter_popup">
    <a class="filter_popup_link">$_("Target")</a>
+   #if $target_filtered
+     $filter_enabled_marker($target_filtered)
+   #end if
    <div id="target">
     <table>
      <tr><td>$define_inline_filter("target", "alert.target.node.address.address")</td></tr>
@@ -693,14 +694,13 @@ function ${type}_set_filter_saved() {
      $filter_reset()
     </table>
    </div>
-
-   #if $target_filtered
-     $filter_enabled_marker($target_filtered)
-   #end if
   </th>
 
   <th class="filter_popup">
    <a class="filter_popup_link">$_("Sensor")</a>
+   #if $analyzer_filtered
+     $filter_enabled_marker($analyzer_filtered)
+   #end if
    <div id="analyzer">
     <table>
      <tr><td>$define_inline_filter("analyzer", "alert.analyzer.name")</td></tr>
@@ -708,10 +708,6 @@ function ${type}_set_filter_saved() {
      $filter_reset()
     </table>
    </div>
-
-   #if $analyzer_filtered
-     $filter_enabled_marker($analyzer_filtered)
-   #end if
   </th>
 
   <td>$_("Time")</td>
diff --git a/prewikka/templates/MessageListing.tmpl b/prewikka/templates/MessageListing.tmpl
index 8620f97..dbc442c 100644
--- a/prewikka/templates/MessageListing.tmpl
+++ b/prewikka/templates/MessageListing.tmpl
@@ -21,7 +21,7 @@ var autorefresh_enabled = true;
    }
 
   \$(".filter_popup_link").click(function(){
-        \$(this).next().popupUnique(function(data){data.show()}, function(data){data.hide()})
+        \$(this).nextAll("div").popupUnique(function(data){data.show()}, function(data){data.hide()})
         return false;
   });
 
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog