[MERGE] trunk

bzr revid: fme@openerp.com-20121115173656-jgyhg977m1y2b50l

2 files changed, 155 insertions, 164 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fd262e404fa..41cd30c7bd7 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -20,20 +20,6 @@
   font-style: normal;
 }
 
-@media print {
-  .oe_topbar, .oe_leftbar, .oe_loading {
-    display: none !important;
-  }
-}
-.openerp.openerp_webclient_container {
-  height: 100%;
-}
-
-.text-tag .text-button {
-  height: auto !important;
-  min-height: 16px;
-}
-
 .openerp {
   padding: 0;
   margin: 0;
@@ -46,6 +32,9 @@
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
    */
 }
+.openerp.openerp_webclient_container {
+  height: 100%;
+}
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
   font-style: italic !important;
@@ -207,6 +196,10 @@
 .openerp .oe_bounce_container {
   display: inline-block;
 }
+.openerp .text-tag .text-button {
+  height: auto !important;
+  min-height: 16px;
+}
 .openerp .ui-tabs {
   position: static;
 }
@@ -2393,6 +2386,77 @@
 .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
   display: block;
 }
+.openerp .oe_fileupload {
+  display: inline-block;
+  clear: both;
+  width: 100%;
+}
+.openerp .oe_fileupload .oe_add {
+  float: left;
+  position: relative;
+  width: 100%;
+  left: 2px;
+  top: 7px;
+}
+.openerp .oe_fileupload .oe_add button {
+  display: inline;
+  height: 24px;
+  font-size: 12px;
+  line-height: 12px;
+  vertical-align: middle;
+}
+.openerp .oe_fileupload .oe_add button.oe_attach {
+  width: 24px;
+  overflow: hidden;
+  width: 24px;
+  overflow: hidden;
+  background: transparent;
+  color: #7c7bad;
+  box-shadow: none;
+  border: none;
+  text-shadow: none;
+}
+.openerp .oe_fileupload .oe_add button.oe_attach .oe_e {
+  position: relative;
+  top: -1px;
+  left: -9px;
+}
+.openerp .oe_fileupload .oe_add input.oe_form_binary_file {
+  display: inline-block;
+  margin-left: -5px;
+  height: 28px;
+  width: 52px;
+  margin-top: -26px;
+}
+.openerp .oe_fileupload .oe_add .oe_attach_label {
+  color: #7c7bad;
+  margin-left: -3px;
+}
+.openerp .oe_fileupload .oe_attachments {
+  margin-bottom: 4px;
+  margin-right: 0px;
+  font-size: 12px;
+  border-radius: 2px;
+  border: solid 1px rgba(124, 123, 173, 0.14);
+}
+.openerp .oe_fileupload .oe_attachments .oe_attachment {
+  padding: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e {
+  font-size: 23px;
+  margin-top: -5px;
+}
+.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover {
+  text-decoration: none;
+}
+.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) {
+  background: white;
+}
+.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
+  background: #f4f5fa;
+}
 .openerp .oe_form_field_many2one td:first-child {
   position: relative;
 }
@@ -2938,78 +3002,6 @@
   color: #333333;
 }
 
-.openerp .oe_fileupload {
-  display: inline-block;
-  clear: both;
-  width: 100%;
-}
-.openerp .oe_fileupload .oe_add {
-  float: left;
-  position: relative;
-  width: 100%;
-  left: 2px;
-  top: 7px;
-}
-.openerp .oe_fileupload .oe_add button {
-  display: inline;
-  height: 24px;
-  font-size: 12px;
-  line-height: 12px;
-  vertical-align: middle;
-}
-.openerp .oe_fileupload .oe_add button.oe_attach {
-  width: 24px;
-  overflow: hidden;
-  width: 24px;
-  overflow: hidden;
-  background: transparent;
-  color: #7c7bad;
-  box-shadow: none;
-  border: none;
-  text-shadow: none;
-}
-.openerp .oe_fileupload .oe_add button.oe_attach .oe_e {
-  position: relative;
-  top: -1px;
-  left: -9px;
-}
-.openerp .oe_fileupload .oe_add input.oe_form_binary_file {
-  display: inline-block;
-  margin-left: -5px;
-  height: 28px;
-  width: 52px;
-  margin-top: -26px;
-}
-.openerp .oe_fileupload .oe_add .oe_attach_label {
-  color: #7c7bad;
-  margin-left: -3px;
-}
-.openerp .oe_fileupload .oe_attachments {
-  margin-bottom: 4px;
-  margin-right: 0px;
-  font-size: 12px;
-  border-radius: 2px;
-  border: solid 1px rgba(124, 123, 173, 0.14);
-}
-.openerp .oe_fileupload .oe_attachments .oe_attachment {
-  padding: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-}
-.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e {
-  font-size: 23px;
-  margin-top: -5px;
-}
-.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover {
-  text-decoration: none;
-}
-.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) {
-  background: white;
-}
-.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
-  background: #f4f5fa;
-}
-
 .kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
   background-size: cover;
@@ -3068,8 +3060,8 @@ div.ui-widget-overlay {
   .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_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, .openerp .oe_topbar, .openerp .oe_leftbar, .openerp .oe_loading {
+    display: none !important;
   }
   .openerp .oe_list_content button, .openerp .oe_list_content input[type=checkbox] {
     visibility: hidden;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c8f6d22f1f9..b6984bff321 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -143,18 +143,6 @@ $sheet-padding: 16px
 
 // }}}
 
-@media print
-    .oe_topbar, .oe_leftbar, .oe_loading
-        display: none !important
-
-.openerp.openerp_webclient_container
-    height: 100%
-
-// jQueryUI css bug fixing
-.text-tag .text-button
-    height: auto !important
-    min-height: 16px
-
 .openerp
     // Global style {{{
     padding: 0
@@ -164,6 +152,8 @@ $sheet-padding: 16px
     font-size: 13px
     background: white
     text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
+    &.openerp_webclient_container
+        height: 100%
     // }}}
     //Placeholder style{{{
     \:-moz-placeholder
@@ -260,6 +250,11 @@ $sheet-padding: 16px
     .oe_bounce_container
         display: inline-block
 
+    // Bug lp:1051746
+    .text-tag .text-button
+        height: auto !important
+        min-height: 16px
+
     // bug noted in jquery ui CSS doesn't seem to occur in IE9,
     // so remove position:relative
     .ui-tabs
@@ -1895,6 +1890,64 @@ $sheet-padding: 16px
                 @include box-sizing(border)
             &:hover .oe_form_field_image_controls
                 display: block
+    .oe_fileupload
+        display: inline-block
+        clear: both
+        width: 100%
+        .oe_add
+            float: left
+            position: relative
+            width: 100%
+            left: +2px
+            top: +7px
+            button
+                display: inline
+                height: 24px
+                font-size: 12px
+                line-height: 12px
+                vertical-align: middle
+            button.oe_attach
+                width: 24px
+                overflow: hidden
+                width: 24px
+                overflow: hidden
+                background: transparent 
+                color: #7C7BAD
+                box-shadow: none
+                border: none
+                text-shadow: none
+                .oe_e
+                    position: relative
+                    top: -1px
+                    left: -9px
+            input.oe_form_binary_file
+                display: inline-block
+                margin-left: -5px
+                height: 28px
+                width: 52px
+                margin-top: -26px
+            .oe_attach_label
+                color: #7C7BAD
+                margin-left: -3px
+        .oe_attachments
+            margin-bottom: 4px
+            margin-right: 0px
+            font-size: 12px
+            border-radius: 2px
+            border: solid 1px rgba(124,123,173,0.14)
+            .oe_attachment
+                padding: 2px
+                padding-left: 4px
+                padding-right: 4px
+                .oe_e
+                    font-size: 23px
+                    margin-top: -5px
+                .oe_e:hover
+                    text-decoration: none
+            .oe_attachment:nth-child(odd)
+                background: white
+            .oe_attachment:nth-child(even)
+                background: #F4F5FA
     // }}}
     // FormView.many2one {{{
     .oe_form_field_many2one
@@ -2297,67 +2350,6 @@ $sheet-padding: 16px
         float: right
         color: #333
     // }}}
-
-.openerp
-    .oe_fileupload
-        display: inline-block
-        clear: both
-        width: 100%
-        .oe_add
-            float: left
-            position: relative
-            width: 100%
-            left: +2px
-            top: +7px
-            button
-                display: inline
-                height: 24px
-                font-size: 12px
-                line-height: 12px
-                vertical-align: middle
-            button.oe_attach
-                width: 24px
-                overflow: hidden
-                width: 24px
-                overflow: hidden
-                background: transparent 
-                color: #7C7BAD
-                box-shadow: none
-                border: none
-                text-shadow: none
-                .oe_e
-                    position: relative
-                    top: -1px
-                    left: -9px
-            input.oe_form_binary_file
-                display: inline-block
-                margin-left: -5px
-                height: 28px
-                width: 52px
-                margin-top: -26px
-            .oe_attach_label
-                color: #7C7BAD
-                margin-left: -3px
-        .oe_attachments
-            margin-bottom: 4px
-            margin-right: 0px
-            font-size: 12px
-            border-radius: 2px
-            border: solid 1px rgba(124,123,173,0.14)
-            .oe_attachment
-                padding: 2px
-                padding-left: 4px
-                padding-right: 4px
-                .oe_e
-                    font-size: 23px
-                    margin-top: -5px
-                .oe_e:hover
-                    text-decoration: none
-            .oe_attachment:nth-child(odd)
-                background: white
-            .oe_attachment:nth-child(even)
-                background: #F4F5FA
-
 // Kitten Mode {{{
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
@@ -2367,11 +2359,13 @@ $sheet-padding: 16px
         opacity: 0.70
 // }}}
 
+// jQueryUI top level {{{
 // The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!!
 div.ui-widget-overlay
     background: black
     @include opacity(0.3)
-
+// TODO: I think only the overlay is problematic, the other top level widgets should use $.fn.openerpClass()
+//       eg: $el.autocomplete().openerpClass();
 .ui-widget
     font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
     color: #4c4c4c
@@ -2398,11 +2392,14 @@ div.ui-widget-overlay
 
 .ui-corner-all
     @include radius(3px)
+// }}}
 
+// @media print {{{
 @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_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, .oe_topbar, .oe_leftbar, .oe_loading
+            // We use !important here because jQuery adds @style = display: block on elements when using $.fn.show()
+            display: none !important
         .oe_list_content
             button, input[type=checkbox]
                 visibility: hidden
@@ -2428,5 +2425,7 @@ div.ui-widget-overlay
             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: