[MERGE] 6.1 changes and trunk

bzr revid: xmo@openerp.com-20120625135215-az1927llmk0vw655

3 files changed, 30 insertions, 17 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0d4912c2840..351a3366651 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1973,6 +1973,9 @@
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
+.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save {
+  background-image: url(/web/static/src/img/iconset-b-remove.png);
+}
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 35e1d08e17f..2ce5cf5a8d5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1559,21 +1559,26 @@ $colour4: #8a89ba
     .oe_form .oe_form_field_one2many > .oe_view_manager
         .oe_list_pager_single_page
             display: none
-    .oe_form_field_one2many > .oe_view_manager
-        .oe_header_row_top
-            display: none
-        .oe_view_manager_header2
-            td
-                padding: 0px 8px
-                line-height: 16px
-                .oe_i
-                    font-size: 13px
-                .oe_pager_group
-                    height: auto
+    .oe_form_field_one2many
+        // TODO: oe_form_field_one2many_list?
+        .oe-listview .oe-edit-row-save
+            background-image: url(/web/static/src/img/iconset-b-remove.png)
+
+        &> .oe_view_manager
+            .oe_header_row_top
+                display: none
+            .oe_view_manager_header2
+                td
+                    padding: 0px 8px
                     line-height: 16px
-                    li
+                    .oe_i
+                        font-size: 13px
+                    .oe_pager_group
                         height: auto
                         line-height: 16px
+                        li
+                            height: auto
+                            line-height: 16px
     // }}}
     // FormView.many2many {{{
     .oe_form .oe_form_field_many2many > .oe-listview
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index 74b660f7613..2faead8fde3 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -477,6 +477,10 @@ label.error {
     display: inline;
     margin: 0 0.5em 0 0;
 }
+.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save,
+.openerp .oe_form_field_one2many_list .oe-listview .oe-edit-row-save {
+    background-image: url("/web/static/src/img/iconset-b-remove.png");
+}
 
 .openerp .oe_form .oe-listview th.oe-sortable .ui-icon,
 .openerp .oe_form .oe-listview th.oe-sortable .ui-icon {
@@ -502,7 +506,7 @@ label.error {
 .openerp .oe_form_readonly .oe_form_field_many2one {
     padding: 3px 2px 2px 2px;
     background-color: white;
-    height: 17px;
+    min-height: 17px;
 }
 .openerp .oe_form_readonly .oe_form_group_cell .field_text {
     height: auto;
@@ -888,6 +892,7 @@ ul.oe-arrow-list {
 ul.oe-arrow-list li {
     display: inline-block;
     margin-left: -1em;
+    vertical-align: top;
 }
 ul.oe-arrow-list li span {
     vertical-align: top;
@@ -896,11 +901,11 @@ ul.oe-arrow-list li span {
     line-height:0em;
 }
 ul.oe-arrow-list .oe-arrow-list-before {
-    border-left-color: rgba(0,0,0,0);
+    border-left-color: transparent;
     border-right-width:0;
 }
 ul.oe-arrow-list .oe-arrow-list-after {
-    border-color: rgba(0,0,0,0);
+    border-color: transparent;
     border-left-color: #DEDEDE;
     border-right-width:0;
 }
@@ -908,10 +913,10 @@ ul.oe-arrow-list li.oe-arrow-list-selected span {
     border-color: #B5B9FF;
 }
 ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-before {
-    border-left-color: rgba(0,0,0,0);
+    border-left-color: transparent;
 }
 ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
-    border-color: rgba(0,0,0,0);
+    border-color: transparent;
     border-left-color: #B5B9FF;
 }
 .openerp ul.oe-arrow-list li:first-child span:first-child{