From eff4e748872410a57c169769e97e4392b0f83869 Mon Sep 17 00:00:00 2001
From: Wieland Lindenthal <w.lindenthal@finn.de>
Date: Mon, 7 Mar 2011 17:11:32 +0100
Subject: [PATCH] Reworking remove buttons of filters using hidden field for
 data storage and siemens styles for layout.

---
 assets/images/close.gif                 | Bin 0 -> 69 bytes
 assets/javascripts/reporting/filters.js |   2 +-
 assets/stylesheets/reporting.css        |  22 +++++++++++++++++-----
 lib/widget/filters/remove_button.rb     |   6 ++++--
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100755 assets/images/close.gif

diff --git a/assets/images/close.gif b/assets/images/close.gif
new file mode 100755
index 0000000000000000000000000000000000000000..50709cf5b7a4df8eae15480a764be196fc4374ba
GIT binary patch
literal 69
zcmZ?wbhEHb6k-r!XkcKN$-r>;?p?*7EDRu^10p~&3`{aT{VPwu<yU4(2y^#sD{((x
SdY@G<L38P=Q`>wQ8LR<QvlF`j

literal 0
HcmV?d00001

diff --git a/assets/javascripts/reporting/filters.js b/assets/javascripts/reporting/filters.js
index 20a3edeab7..de590ba5d1 100644
--- a/assets/javascripts/reporting/filters.js
+++ b/assets/javascripts/reporting/filters.js
@@ -185,7 +185,7 @@ Reporting.Filters = {
       $('operators[' + dependents.first() + ']').value = 'any';
       Reporting.Filters.operator_changed(dependents.first(), $('operators[' + dependents.first() + ']'));
       // Hide remove box of dependent
-      $('rm_' + dependents.first()).hide();
+      $('rm_box_' + dependents.first()).hide();
       $('tr_' + dependents.first()).addClassName("no-border");
       // Remove border of dependent, so it "merges" with the filter before
       active_filters.unshift(dependents.first());
diff --git a/assets/stylesheets/reporting.css b/assets/stylesheets/reporting.css
index 663fd9c9e3..51e5b888c4 100644
--- a/assets/stylesheets/reporting.css
+++ b/assets/stylesheets/reporting.css
@@ -169,20 +169,33 @@
   margin-right: 0px;
   background-image: url(../images/arrow_B_down.gif);
 }
+.remove-box {
+  height: 20px;
+  width: 20px;
+  background: white;
+  float: right;
+  padding: 1px 0 0 0;
+  display: block;
+  margin-top: -5px;
+  margin-right: -2px;
+}
 
 .filter_rem {
   color: transparent;
   overflow: hidden;
   cursor: pointer;
   background: no-repeat center center transparent;
-  height: 16px;
-  width: 16px;
+  height: 18px;
+  width: 18px;
   border-style: none;
+  display: block;
+  margin: 0 0 0 2px;
 }
 
 .icon-filter-rem {
-  background-image: url(../images/remove.png);
+  background-image: url(../images/close.gif);
   position: relative;
+  float:right;
 }
 
 .filter {
@@ -214,8 +227,7 @@ fieldset#filter-settings table td {
   border-color: white;
   border-style: solid;
   border-width: 2px 0px 0px;
-  padding: 2px;
-  vertical-align: middle;
+  padding: 5px 2px 5px 2px;
 }
 
 fieldset#filter-settings table .no-border td {
diff --git a/lib/widget/filters/remove_button.rb b/lib/widget/filters/remove_button.rb
index 8820ce0c4d..a8c6bbde40 100644
--- a/lib/widget/filters/remove_button.rb
+++ b/lib/widget/filters/remove_button.rb
@@ -1,9 +1,11 @@
 class Widget::Filters::RemoveButton < Widget::Filters::Base
   def render
     content_tag :td, :width => "25px" do
-      tag :input, :id => "rm_#{filter_class.underscore_name}",
-        :name => "fields[]", :type => "button", :value => "",
+      hidden_field = tag :input, :id => "rm_#{filter_class.underscore_name}",
+        :name => "fields[]", :type => "hidden", :value => ""
+      button = tag :input, :type => "button", :value => "",
         :class => "icon filter_rem icon-filter-rem"
+      content_tag(:div, hidden_field + button, :id => "rm_box_#{filter_class.underscore_name}", :class => "remove-box")
     end
   end
 end