[MERGE] from trunk

bzr revid: xmo@openerp.com-20120522132246-49w7jbkaytd7q3k2

diff --cc addons/web/static/src/css/base.css
index c101e1b,4a426e1..f2fcc9a
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -1399,28 -1349,16 +1399,28 @@@
  .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
    list-style: none;
    margin: 0;
 +  white-space: nowrap;
  }
 -.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 div {
 +.openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
    display: block;
  }
 +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop {
 +  font-size: 1px;
 +  letter-spacing: -1px;
 +  color: transparent;
 +}
 +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete:before, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop:before {
 +  font-family: "mnmliconsRegular";
 +  content: "d";
 +  font-size: 20px;
 +  color: #404040;
 +}
  .openerp .oe_view_nocontent > img {
    float: left;
-   margin-right: 1.5em;
+   margin: 1.5em;
  }
  .openerp .oe_view_nocontent > div {
    overflow: hidden;

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge