merge upstream

bzr revid: chs@openerp.com-20121114223538-qp233873r33uh3e3

2 files changed, 42 insertions, 25 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b34e699b541..a421336c43f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2316,16 +2316,16 @@
   text-align: justify;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_integer input {
-  width: 6em !important;
+  width: 6em;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_float input {
-  width: 7em !important;
+  width: 7em;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_date input {
-  width: 7.5em !important;
+  width: 7.5em;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_datetime input {
-  width: 11.5em !important;
+  width: 11.5em;
 }
 .openerp .oe_hidden_input_file {
   position: relative;
@@ -2384,6 +2384,9 @@
   float: right;
   padding-left: 2px;
 }
+.openerp .oe_form_field_many2one input {
+  padding-right: 13px;
+}
 .openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
   font-style: italic;
   padding-left: 2em;
@@ -2588,32 +2591,33 @@
   top: 5px;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_cm_button {
-  display: none;
+  line-height: 19px;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
-  height: 27px;
+.openerp .oe_list.oe_list_editable.oe_editing .oe_input_icon {
+  margin-top: 5px;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field {
+  min-width: 0;
+  max-width: none;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
+  height: 27px;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
   border: 1px solid #aaaaff;
   margin: 0;
 }
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select {
+  min-width: 0;
+}
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
   text-align: right;
   width: 100% !important;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span {
-  width: 100% !important;
-}
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
   width: 100% !important;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_field_float, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_view_integer, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date {
-  min-width: 0 !important;
-  max-width: none !important;
-}
 .openerp .oe_list_group_name {
   white-space: nowrap;
 }
@@ -2678,6 +2682,9 @@
   text-align: right !important;
   max-width: 100px;
 }
+.openerp .oe_list_content td.oe_list_field_date, .openerp .oe_list_content th.oe_list_header_date {
+  min-width: 6em;
+}
 .openerp .oe_list_content > thead {
   border-bottom: 2px solid #cacaca;
   background: #eeeeee;
@@ -2745,6 +2752,10 @@
 .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after {
   border-width: 0;
 }
+.openerp .oe_list_content > tbody > tr > td.oe_list_field_boolean input {
+  filter: alpha(opacity=50);
+  opacity: 0.5;
+}
 .openerp .oe_list_content > tbody > tr:nth-child(odd) {
   background-color: #f0f0fa;
   background-color: #f0f0fa;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 368df7f047c..596426917b5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1846,13 +1846,13 @@ $sheet-padding: 16px
     .oe_form_editable
         .oe_form
             .oe_form_field_integer input
-                width: 6em !important
+                width: 6em
             .oe_form_field_float input
-                width: 7em !important
+                width: 7em
             .oe_form_field_date input
-                width: 7.5em !important
+                width: 7.5em
             .oe_form_field_datetime input
-                width: 11.5em !important
+                width: 11.5em
     // }}}
     // FormView.fields_binary {{{
     /* http://www.quirksmode.org/dom/inputfile.html
@@ -1908,6 +1908,8 @@ $sheet-padding: 16px
             line-height: 14px
             float: right
             padding-left: 2px
+        input
+            padding-right: 13px
     &.ui-autocomplete
         li.oe_m2o_dropdown_option a
             font-style: italic
@@ -2050,26 +2052,26 @@ $sheet-padding: 16px
         .oe_m2o_drop_down_button
             top: 5px
         .oe_m2o_cm_button
-            display: none
+            line-height: 19px
+        .oe_input_icon
+            margin-top: 5px
         .oe_form_field
+            min-width: 0
+            max-width: none
             input, textarea
                 height: $row-height
-            input, textarea
                 @include radius(0)
                 border: 1px solid #aaf
                 margin: 0
+            input, textarea, select
+                min-width: 0
             &.oe_form_field_float,&.oe_form_view_integer
                 input
                     text-align: right
                     width: 100% !important
             &.oe_form_field_datetime,&.oe_form_field_date
-                > span
-                    width: 100% !important
                 input.oe_datepicker_master
                     width: 100% !important
-            .oe_form_field_float,.oe_form_view_integer,&.oe_form_field_datetime,&.oe_form_field_date
-                min-width: 0 !important
-                max-width: none !important
     .oe_list_group_name
         white-space: nowrap
     // }}}
@@ -2128,6 +2130,8 @@ $sheet-padding: 16px
         td.oe_number
             text-align: right !important
             max-width: 100px
+        td.oe_list_field_date, th.oe_list_header_date
+            min-width: 6em
         > thead
             border-bottom: 2px solid #cacaca
             background: #eee
@@ -2177,6 +2181,8 @@ $sheet-padding: 16px
                     width: 17px
                     &:after
                         border-width: 0
+                > td.oe_list_field_boolean input
+                    @include opacity()
             > tr:nth-child(odd)
                 background-color: #f0f0fa
                 @include vertical-gradient(#f0f0fa, #eeeef6)