[MERGE] from trunk

bzr revid: chm@openerp.com-20121026140412-wfwl9ze4s8pzs9sg

2 files changed, 73 insertions, 5 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3c1022c6e46..ba6211ccceb 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -25,6 +25,7 @@
     display: none !important;
   }
 }
+
 .openerp.openerp_webclient_container {
   height: 100%;
 }
@@ -44,7 +45,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -1325,6 +1326,9 @@
 .openerp .oe_view_manager .oe_view_manager_body {
   height: inherit;
 }
+.openerp .oe_view_manager .oe_view_manager_body .oe_view_manager_view_list {
+  min-height: 132px;
+}
 .openerp .oe_view_manager .oe_view_manager_view_kanban {
   height: inherit;
 }
@@ -2928,8 +2932,6 @@ div.ui-widget-overlay {
   border-radius: 3px;
 }
 
-
-
 .openerp .oe_fileuploader {
     display: inline-block;
     clear: both;
@@ -2970,6 +2972,41 @@ div.ui-widget-overlay {
     font-size: 30px;
 }
 
-.openerp .oe_fileuploader {
-    clear: both;
+
+@media print {
+  .openerp {
+    text-shadow: none;
+  }
+  .openerp .oe_header_row, .openerp ul.oe_header, .openerp div.oe_mail_thread_action, .openerp .oe_mail_recthread_actions, .openerp .oe_button_box, .openerp .oe_form button, .openerp button.oe_invite, .openerp .oe_form header, .openerp .openerp .oe_notebook > li.ui-state-default {
+    display: none;
+  }
+  .openerp .oe_list_content button, .openerp .oe_list_content input[type=checkbox] {
+    visibility: hidden;
+  }
+  .openerp .tree_header button, .openerp .oe_mail .oe_mail_thread_msg .oe_mail_unread, .openerp .oe_mail_fetch_more, .openerp .oe_m2o_drop_down_button img, .openerp .oe_form_field_one2many_list_row_add {
+    visibility: hidden;
+  }
+  .openerp a.oe_m2o_cm_button, .openerp a.oe_e {
+    visibility: hidden;
+  }
+  .openerp .oe_form .oe_form_field_date img, .openerp .oe_form .oe_form_field_datetime img {
+    visibility: hidden;
+  }
+  .openerp .oe_notebook > li.ui-tabs-selected {
+    display: block;
+  }
+  .openerp .oe_application .oe_form_sheet, .openerp .oe_application .oe_form_sheetbg {
+    border: 0px !important;
+    box-shadow: 0px 0px 0px;
+  }
+  .openerp .oe_view_manager_current > .oe_view_manager_header {
+    border: 0px !important;
+    box-shadow: 0px 0px 0px;
+  }
+  .openerp .text-core .text-wrap .text-arrow {
+    background: none;
+  }
+  .openerp .openerp div.oe_mail_wall {
+    overflow: hidden !important;
+  }
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1096dd7564d..1f1993ff74d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1070,6 +1070,8 @@ $sheet-max-width: 860px
     .oe_view_manager
         .oe_view_manager_body
             height: inherit
+            .oe_view_manager_view_list
+                min-height: 132px
         .oe_view_manager_view_kanban
             height: inherit
 
@@ -2373,5 +2375,34 @@ div.ui-widget-overlay
 .ui-corner-all
     @include radius(3px)
 
+@media print
+    .openerp
+        .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default
+            display: none
+        .oe_list_content
+            button, input[type=checkbox]
+                visibility: hidden
+        .tree_header button, .oe_mail .oe_mail_thread_msg .oe_mail_unread, .oe_mail_fetch_more, .oe_m2o_drop_down_button img, .oe_form_field_one2many_list_row_add
+            visibility: hidden
+        a
+            &.oe_m2o_cm_button, &.oe_e
+                visibility: hidden
+        .oe_form
+            .oe_form_field_date img, .oe_form_field_datetime img
+                visibility: hidden
+        .oe_notebook > li.ui-tabs-selected
+            display: block
+        .oe_application
+            .oe_form_sheet, .oe_form_sheetbg
+                border: 0px !important
+                box-shadow: 0px 0px 0px
+        .oe_view_manager_current > .oe_view_manager_header
+            border: 0px !important
+            box-shadow: 0px 0px 0px
+        text-shadow: none
+        .text-core .text-wrap .text-arrow
+            background: none
+        .openerp div.oe_mail_wall
+            overflow: hidden !important
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: