[MERGE] trunk

bzr revid: al@openerp.com-20120725074053-e3gltrdfzm8bb7j8

2 files changed, 85 insertions, 35 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3b2fb526144..30c0b5ea0b3 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1448,20 +1448,31 @@
   filter: alpha(opacity=50);
   opacity: 0.5;
 }
-.openerp .oe_searchview .oe_searchview_facets {
-  min-height: 22px;
+.openerp .oe_searchview .oe_searchview_search {
+  font-size: 1px;
+  letter-spacing: -1px;
+  color: transparent;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
+  position: absolute;
+  left: 3px;
+  top: 1px;
+  padding: 0;
+  border: none;
+  background: transparent;
 }
-.openerp .oe_searchview .oe_searchview_facets:before {
-  color: #cccccc;
-  font-family: "mnmliconsRegular";
+.openerp .oe_searchview .oe_searchview_search:before {
+  font: 21px "mnmliconsRegular";
   content: "r";
-  font-size: 130%;
-  display: inline;
-  position: relative;
-  left: 6px;
-  top: 2px;
   color: #a3a3a3;
-  padding-right: 4px;
+}
+.openerp .oe_searchview .oe_searchview_facets {
+  min-height: 22px;
+  margin-left: 15px;
 }
 .openerp .oe_searchview .oe_searchview_facets * {
   vertical-align: top;
@@ -2220,9 +2231,33 @@
   height: auto;
   line-height: 16px;
 }
+.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .oe_list_save {
+  visibility: hidden;
+}
 .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page {
   display: none;
 }
+.openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard {
+  display: none;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+  display: none;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_save {
+  display: inline-block;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_discard {
+  display: inline;
+}
+.openerp .oe_list {
+  position: relative;
+}
+.openerp .oe_list .oe_form .oe_form_field {
+  width: auto;
+  position: absolute;
+  margin: 0 !important;
+  padding: 0;
+}
 .openerp .oe_list_content {
   width: 100%;
 }
@@ -2280,9 +2315,7 @@
 }
 .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
   padding: 3px 6px;
-}
-.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress {
-  width: 100%;
+  white-space: pre-line;
 }
 .openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
   border: none;
@@ -2330,9 +2363,6 @@
 .openerp .oe_list_content .numeric input {
   text-align: right;
 }
-.openerp .oe_list_content .oe_list_edit_row_save:before {
-  content: "S";
-}
 .openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index de0ab08391b..7fbe5c1c336 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -92,9 +92,8 @@ $sheet-max-width: 860px
     letter-spacing: -1px
     color: transparent
     &:before
-        font-family: "mnmliconsRegular"
+        font: 21px "mnmliconsRegular"
         content: $icon-name
-        font-size: 20px
         color: $color
 
 // }}}
@@ -1126,19 +1125,20 @@ $sheet-max-width: 860px
                 border-right: 5px solid transparent
                 @include opacity()
 
+        .oe_searchview_search
+            @include text-to-icon("r", #a3a3a3)
+            @include box-shadow(none)
+            @include radius(0)
+            position: absolute
+            left: 3px
+            top: 1px
+            padding: 0
+            border: none
+            background: transparent
+
         .oe_searchview_facets
             min-height: 22px
-            &:before
-                color: #ccc
-                font-family: "mnmliconsRegular"
-                content: "r"
-                font-size: 130%
-                display: inline
-                position: relative
-                left: 6px
-                top: 2px
-                color: #a3a3a3
-                padding-right: 4px
+            margin-left: 15px
             *
                 vertical-align: top
                 display: inline-block
@@ -1745,6 +1745,9 @@ $sheet-max-width: 860px
                         li
                             height: auto
                             line-height: 16px
+        .oe_list_buttons.oe_editing .oe_list_save
+            // keep "save row" button hidden in o2m
+            visibility: hidden
     // }}}
     // FormView.many2many {{{
     .oe_form .oe_form_field_many2many > .oe_list
@@ -1752,6 +1755,25 @@ $sheet-max-width: 860px
             display: none
     // }}}
     // ListView {{{
+    .oe_list_buttons
+        .oe_list_save, .oe_list_discard
+            display: none
+        &.oe_editing
+            .oe_list_add, .oe_list_button_import
+                display: none
+            .oe_list_save
+                display: inline-block
+            .oe_list_discard
+                display: inline
+
+    .oe_list
+        position: relative
+        .oe_form .oe_form_field
+            width: auto
+            position: absolute
+            margin: 0 !important // dammit
+            padding: 0
+
     .oe_list_content
         width: 100%
         td:first-child, th:first-child
@@ -1795,8 +1817,7 @@ $sheet-max-width: 860px
                 border-top: 1px solid #ddd
                 > td.oe_list_field_cell
                     padding: 3px 6px
-                    progress
-                        width: 100%
+                    white-space: pre-line
                 > td, > th
                     > button
                         border: none
@@ -1824,8 +1845,6 @@ $sheet-max-width: 860px
             width: 82px
             input
                 text-align: right
-        .oe_list_edit_row_save:before
-            content: "S"
     // }}}
     // Translation {{{
     .oe_trad_field.touched
@@ -1934,6 +1953,7 @@ $sheet-max-width: 860px
     background-attachment: fixed
     >*
         opacity: 0.70
+
 // }}}
 
 div.ui-widget-overlay