[MERGE] from trunk

bzr revid: chm@openerp.com-20130326090427-g78bigwi30rzbthd

2 files changed, 81 insertions, 4 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 368218b1293..559b0e40e35 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -355,6 +355,12 @@
   float: right;
   margin-left: 8px;
 }
+.openerp .oe_text_center {
+  text-align: center;
+}
+.openerp .oe_text_left {
+  text-align: left;
+}
 .openerp .oe_text_right {
   text-align: right;
 }
@@ -1806,7 +1812,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer {
   position: absolute;
-  z-index: 100;
+  z-index: 2;
   margin-top: 4px;
   top: 100%;
   right: -1px;
@@ -2228,6 +2234,26 @@
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
   font-weight: normal;
 }
+.openerp .oe_form .oe_form_box_info {
+  background: #ffee99;
+  border-bottom: 1px solid #ccbb66;
+  padding: 4px;
+}
+.openerp .oe_form .oe_form_box_info > p {
+  margin: auto;
+}
+.openerp .oe_form .oe_form_box_warning {
+  background: #bd362f;
+  border-bottom: 1px solid #990000;
+  padding: 4px;
+}
+.openerp .oe_form .oe_form_box_warning * {
+  color: white;
+  text-shadow: none;
+}
+.openerp .oe_form .oe_form_box_warning > p {
+  margin: auto;
+}
 .openerp .oe_form .oe_form_button {
   margin: 2px;
 }
@@ -2330,6 +2356,13 @@
 .openerp .oe_form .oe_form_field_text {
   width: 100%;
 }
+.openerp .oe_form .oe_form_field_text .oe_form_text_content {
+  text-overflow: ellipsis;
+  display: inline-block;
+  white-space: pre-wrap;
+  overflow-x: hidden;
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
 .openerp .oe_form .oe_form_field_email input,
@@ -3187,6 +3220,14 @@ div.ui-widget-overlay {
   border-radius: 3px;
 }
 
+.openerp .db_option_table td {
+  padding-bottom: 10px !important;
+}
+
+.openerp_ie .placeholder {
+  color: #afafb6 !important;
+  font-style: italic !important;
+}
 .openerp_ie .oe_form_field_boolean input {
   background: white;
 }
@@ -3205,6 +3246,9 @@ div.ui-widget-overlay {
   padding-top: 0;
   padding-bottom: 0;
 }
+.openerp_ie .oe_view_manager_view_kanban {
+  display: table-cell;
+}
 .openerp_ie .oe_view_manager_buttons button.oe_write_full {
   padding-top: 0;
   padding-bottom: 0;
@@ -3353,7 +3397,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-
 .blockUI.blockOverlay {
   background-color: black;
   opacity: 0.6;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5ff3c91442f..d687ce21869 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -370,6 +370,10 @@ $sheet-padding: 16px
     .oe_right
         float: right
         margin-left: 8px
+    .oe_text_center
+        text-align: center
+    .oe_text_left
+        text-align: left
     .oe_text_right
         text-align: right
     .oe_clear
@@ -1453,7 +1457,7 @@ $sheet-padding: 16px
 
         .oe_searchview_drawer
             position: absolute
-            z-index: 100
+            z-index: 2
             // detach drawer from field slightly
             margin-top: 4px
             top: 100%
@@ -1777,7 +1781,21 @@ $sheet-padding: 16px
                 padding: 2px 11px 2px 0px !important
             label.oe_form_label_help
                 font-weight: normal
-
+        .oe_form_box_info
+            background: #fe9
+            border-bottom: 1px solid #cb6
+            padding: 4px
+            > p
+                margin: auto
+        .oe_form_box_warning
+            background: #bd362f
+            border-bottom: 1px solid #900
+            padding: 4px
+            *
+                color: white
+                text-shadow: none
+            > p
+                margin: auto
     // }}}
     // FormView.group {{{
     .oe_form
@@ -1849,6 +1867,12 @@ $sheet-padding: 16px
     .oe_form
         .oe_form_field_text
             width: 100%
+            .oe_form_text_content
+                text-overflow: ellipsis
+                display: inline-block
+                white-space: pre-wrap
+                overflow-x: hidden
+                width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
         .oe_form_field_email input,
@@ -2512,8 +2536,16 @@ div.ui-widget-overlay
     @include radius(3px)
 // }}}
 
+.openerp
+    .db_option_table
+        td
+            padding-bottom: 10px !important
+
 // Internet Explorer 9+ specifics {{{
 .openerp_ie
+    .placeholder
+        color: $tag-border !important
+        font-style: italic !important
     .oe_form_field_boolean input
         background: #fff
     .db_option_table .oe_form_field_selection
@@ -2529,6 +2561,8 @@ div.ui-widget-overlay
         button.oe_highlight
             padding-top: 0
             padding-bottom: 0
+    .oe_view_manager_view_kanban
+        display: table-cell
     .oe_view_manager_buttons
         button.oe_write_full
             padding-top: 0