[IMP] unify open/close behavior of advanced and custom filters, close custom after creating

bzr revid: xmo@openerp.com-20120511143225-472ineg91e111tvv

2 files changed, 38 insertions, 32 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6d2287aa1c0..11095d7baf1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1183,6 +1183,13 @@
   border-top: none;
   margin: 0;
 }
+.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
+  margin: 0;
+  cursor: pointer;
+}
+.openerp .oe_searchview .oe_searchview_drawer h4:before {
+  content: "▸ ";
+}
 .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
   border: none;
   background: white;
@@ -1224,24 +1231,20 @@
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form {
+  display: none;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button {
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button:before {
   font-family: "mnmliconsRegular";
   content: "S";
   font-size: 20px;
   color: #404040;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
-  margin: 0;
-  cursor: pointer;
-}
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
-  content: "▸ ";
-}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form {
   display: none;
 }
@@ -1259,10 +1262,10 @@
   list-style: none;
   margin: 0;
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
   content: "▾ ";
 }
-.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened form {
+.openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
   display: block;
 }
 .openerp .oe_view_topbar {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf35624d4b1..c1824427f58 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -939,6 +939,13 @@ $colour4: #8a89ba
                 border-top: none
                 margin: 0
 
+            h4, h4 *
+                margin: 0
+                cursor: pointer
+
+            h4:before
+                content: "▸ "
+
             button, .button
                 border: none
                 background: white
@@ -975,24 +982,20 @@ $colour4: #8a89ba
                         background-color: #f0f0fa
 
             .oe_searchview_custom
-                .oe_searchview_custom_save
-                    font-size: 1px
-                    letter-spacing: -1px
-                    color: transparent
-                    &:before
-                        font-family: "mnmliconsRegular"
-                        content: "S"
-                        font-size: 20px
-                        color: #404040
-
-            .oe_searchview_advanced
-                h4
-                    margin: 0
-                    cursor: pointer
+                form
+                    display: none
 
-                h4:before
-                    content: "▸ "
+                    button
+                        font-size: 1px
+                        letter-spacing: -1px
+                        color: transparent
+                        &:before
+                            font-family: "mnmliconsRegular"
+                            content: "S"
+                            font-size: 20px
+                            color: #404040
 
+            .oe_searchview_advanced
                 form
                     display: none
 
@@ -1008,11 +1011,11 @@ $colour4: #8a89ba
                     list-style: none
                     margin: 0
 
-                &.oe_opened
-                    h4:before
-                        content: "▾ "
-                    form
-                        display: block
+            .oe_opened
+                h4:before
+                    content: "▾ "
+                form
+                    display: block
     // }}}
     // View.topbar {{{
     .oe_view_topbar