[MERGE] trunk

bzr revid: al@openerp.com-20120608165932-qp494qy31xa6oi6t

1 files changed, 190 insertions, 84 deletions

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3556abbf55e..a4660ff24bc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -181,7 +181,7 @@ $colour4: #8a89ba
         border: 1px solid #ababab
         color: #404040
         margin: 0
-        padding: 4px 12px
+        padding: 3px 12px
         font-size: 13px
         text-align: center
         @include vertical-gradient(#efefef, #d8d8d8)
@@ -899,7 +899,7 @@ $colour4: #8a89ba
         left: 0px
         padding: 8px
         border: 1px solid #afafb6
-        width: 120px
+        min-width: 120px
         overflow-x: hidden
         z-index: 900
         text-align: left
@@ -1252,13 +1252,15 @@ $colour4: #8a89ba
             background: #ED6F6A
     // }}}
     // FormView.customdivs {{{
-    .oe_form_topbar
+    .oe_form header
+        position: relative
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
         padding: 0 8px
         line-height: 30px 
         button
             font-size: 12px 
+            float: left
             height: 24px !important
             line-height: 24px 
             vertical-align: top
@@ -1289,10 +1291,12 @@ $colour4: #8a89ba
                     &:hover
                         color: black
         .oe_form_steps
-            img  
+            display: inline-block
+            float: right
+            img
                 margin: 0 8px
                 vertical-align: top
-            li   
+            li
                 border-right: none 
                 padding: 0
                 &:first-child
@@ -1303,60 +1307,76 @@ $colour4: #8a89ba
         .oe_form_steps_active
             font-weight: bold 
             color: #b33630
-    .oe_form_topbar.oe_form_topbar_hifirst button:first-child, button.oe_form_button_hi
-        color: white
-        background: #DC5F59
-        background: -moz-linear-gradient(#DC5F59, #B33630)
-        background: -webkit-gradient(linear, left top, left bottom, from(#DC5F59), to(#B33630))
-        background: -webkit-linear-gradient(#DC5F59, #B33630)
-        -moz-box-shadow: none
-        -webkit-box-shadow: none
-        -box-shadow: none
-    .oe_form_topbar.oe_form_topbar_hifirst button:first-child:hover, button.oe_form_button_hi:hover
-        background: #DF6B66
-        background: -moz-linear-gradient( #DF6B66, #BF3A33)
-        background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33))
-        background: -webkit-linear-gradient( #DF6B66, #BF3A33)
-        -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
-        -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
-        -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
+    .oe_form_readonly
+        button.oe_form_button_hi
+            color: white
+            background: #DC5F59
+            background: -moz-linear-gradient(#DC5F59, #B33630)
+            background: -webkit-gradient(linear, left top, left bottom, from(#DC5F59), to(#B33630))
+            background: -webkit-linear-gradient(#DC5F59, #B33630)
+            -moz-box-shadow: none
+            -webkit-box-shadow: none
+            -box-shadow: none
+        button.oe_form_button_hi:hover
+            background: #DF6B66
+            background: -moz-linear-gradient( #DF6B66, #BF3A33)
+            background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33))
+            background: -webkit-linear-gradient( #DF6B66, #BF3A33)
+            -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
+            -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
+            -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
     .oe_application
         .oe_form_sheetbg
             background: url(/web/static/src/img/form_sheetbg.png)
             padding: 8px 0
             border-bottom: 1px solid #ddd 
-        .oe_form_sheet_width, .oe_form_bottom
+        .oe_form_sheet_width, footer
             min-width: 650px
-            max-width: 980px
+            max-width: 960px
             margin: 0 auto
         .oe_form_sheet
-            padding: 8px 8px 8px 8px
+            padding: 18px
             background: white
-            min-height: 420px
+            min-height: 330px
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
     // }}}
     // FormView.layout {{{
+    .oe_form_invisible
+        display: none
+    .oe_form_editable .oe_form_editable_hidden
+        display: none
+    .oe_form_readonly
+        .oe_form_readonly_hidden, .oe_form_field:empty
+            display: none
     .oe_form
-        .oe_form_group_cell
-            line-height: 18px
-            padding: 2px
-            height: 20px
-        .oe_form_group_cell > .oe_form_field_many2one,
-        .oe_form_group_cell > .oe_form_field_many2one input,
-        .oe_form_group_cell > .oe_form_field_char input,
-        .oe_form_group_cell > .oe_form_field_text textarea,
-        .oe_form_group_cell > .oe_form_field_email,
-        .oe_form_group_cell > .oe_form_field_email input,
-        .oe_form_group_cell > .oe_form_field_url,
-        .oe_form_group_cell > .oe_form_field_url input,
-        .oe_form_group_cell > .oe_form_field_float input,
-        .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > div > .oe_datepicker_root,
-        .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
+        .oe_form_field_text
             width: 100%
-        .oe_form_group_cell.oe_form_group_nested
-            padding: 0
+
+        .oe_form_field_char input,
+        .oe_form_field_text textarea,
+        .oe_form_field_url input,
+        .oe_form_field_selection select
+            width: inherit
+
+        .oe_form_field_float input
+            width: 100px
+
+        h1 .oe_form_field_float input
+            width: 140px
+
+        h2 .oe_form_field_float input
+            width: 120px
+
+        h1, h2, h3, h4, h5, h6
+            margin: 0 0 4px 0
+            input
+                height: inherit !important
+                font-size: inherit
+    .oe_form_nosheet > *:not(.oe_form_topbar)
+        margin-left: 10px !important
+        margin-right: 10px !important
+
     // }}}
     // FormView.label {{{
     .oe_form
@@ -1374,8 +1394,27 @@ $colour4: #8a89ba
     // }}}
     // FormView.fields {{{
     .oe_form
-        textarea
+        .oe_form_field_text textarea
             resize: vertical
+        .oe_form_field
+            width: 100%
+            display: inline-block
+            padding: 2px 2px 2px 0px
+            line-height: 18px
+            input
+                margin: 0px
+
+        .oe_form_field_integer
+            width: 180px
+        .oe_form_field_float
+            width: 180px
+        .oe_form_field_date
+            width: 7em
+        .oe_form_field_datetime
+            width: 11em
+        .oe_form_inline
+            width: auto
+
         input[type="text"],
         input[type="password"],
         input[type="file"],
@@ -1392,7 +1431,6 @@ $colour4: #8a89ba
             -ms-box-sizing: border-box
             box-sizing: border-box
             padding: 0 2px
-            margin: 0 2px
             border: 1px solid #999
             -moz-border-radius: 3px
             -webkit-border-radius: 3px
@@ -1433,8 +1471,6 @@ $colour4: #8a89ba
             white-space: nowrap
         .oe_form_field_boolean
             padding-top: 4px
-        .oe_form_field_datetime input
-            min-width: 11em
         .oe_form_field_many2manytags
             .text-wrap
                 width: 100% !important
@@ -1450,7 +1486,6 @@ $colour4: #8a89ba
                 color: black
                 padding: 0px 3px 0px 3px
                 margin: 0 2px 2px 0
-                cursor: pointer
                 height: 16px
                 font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
             .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
@@ -1467,16 +1502,6 @@ $colour4: #8a89ba
             input, select, textarea
                 background-color: #F66 !important
                 border: 1px solid #D00 !important
-        .oe_button.oe_field_button
-            display: block
-            -webkit-border-top-left-radius: 0px
-            -webkit-border-bottom-left-radius: 0px
-            -moz-border-radius-topleft: 0px
-            -moz-border-radius-bottomleft: 0px
-            border-top-left-radius: 0px
-            border-bottom-left-radius: 0px
-            margin-right: -1px
-            height: 22px
         .oe_input_icon
             cursor: pointer
             margin: 3px 0 0 -21px
@@ -1491,23 +1516,59 @@ $colour4: #8a89ba
         .oe_form_group_cell .oe_kanban_view
             // Hack due to absolute positioning of kanban view messing with o2m
             position: static
+        .oe_form_field_with_button
+            input
+                width: 100%
+            > .oe_button
+                float: right
+                -webkit-border-top-left-radius: 0px
+                -webkit-border-bottom-left-radius: 0px
+                -moz-border-radius-topleft: 0px
+                -moz-border-radius-bottomleft: 0px
+                border-top-left-radius: 0px
+                border-bottom-left-radius: 0px
+                height: 22px
+            > div
+                position: relative
+                overflow: hidden
+
+        .oe_form_title
+            width: 55%
+        .oe_form_title:after
+            content: "."
+            display: block
+            height: 0
+            clear: both
+            visibility: hidden
+        .oe_form_button_box
+            width: 200px
+            text-align: center
+
+        .oe_form_group
+            margin: 5px 0px 5px 0px
+
+        .oe_form_group_cell .oe_kanban_view
+            // Hack due to absolute positioning of kanban view messing with o2m
+            position: static
+
     // }}}
     // FormView.buttons {{{
     .oe_form
         .oe_form_button.oe_button
             height: 22px
-            color: #4c4c4c
+            white-space: nowrap
             span
                 position: relative
                 vertical-align: top
         .oe_form_button > img
             vertical-align: -3px
             padding: 0 2px
-        .oe_form_group_cell > .oe_form_button.oe_button
-            display: block
-            white-space: nowrap
-            min-width: 100%
-            width: 100%
+    // From FP:    .oe_form_group_cell > .oe_form_button.oe_button
+    // From FP:        display: block
+    // From FP:        white-space: nowrap
+    // From FP:        min-width: 100%
+    // From FP:        width: 100%
+
     // }}}
     // FormView.binaryfile {{{
     /* http://www.quirksmode.org/dom/inputfile.html
@@ -1517,6 +1578,7 @@ $colour4: #8a89ba
         .oe-binary-file-set
             overflow: hidden
             position: relative
+            display: inline-block
             width: 45px
             height: 30px
         input.oe-binary-file
@@ -1532,6 +1594,30 @@ $colour4: #8a89ba
             -ms-filter: "alpha(opacity=0)"
             margin: 0
             padding: 0
+        .oe_form_field_image
+            > img
+                min-width: 100px
+            padding: 0
+            position: relative
+            display: inline-block
+            width: auto
+            vertical-align: top
+            .oe_form_field_image_controls
+                position: absolute
+                top: 1px
+                padding: 3px 0 0 0
+                margin: 0 1px
+                @include opacity(0.7)
+                width: 99%
+                text-align: center
+                background: url(/web/static/src/img/form_sheetbg.png)
+                border-bottom: 1px dotted black
+                -moz-box-sizing: border-box
+                -webkit-box-sizing: border-box
+                -ms-box-sizing: border-box
+                box-sizing: border-box
+            &:hover .oe_form_field_image_controls
+                @include opacity(1)
     // }}}
     // FormView.separator {{{
     .oe_horizontal_border
@@ -1588,12 +1674,17 @@ $colour4: #8a89ba
         cursor: default
     .oe_form_notebook_page
         padding: 0
+    div.ui-tabs
+        padding: 3px 0px 3px 0px
     .ui-tabs-hide
         display: none
 
     // }}}
     // FormView.progressbar {{{
     .oe_form
+        .oe_form_field_progressbar
+            display: inline-block
+            min-width: 70px
         .oe_form_field_progressbar.ui-progressbar
             height: 22px
             font-size: 10px
@@ -1636,36 +1727,32 @@ $colour4: #8a89ba
     // }}}
     // FormView.classes for openerp views {{{
     .oe_form
-        .oe_form_title, .oe_form_title input
-            font-size: 20px
-            font-weight: bold
-            height: 30px
-        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
-        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
+        td.oe_form_group_cell_label
             border-right: 1px solid #ddd
+            padding: 2px 0px 2px 0px
             label
+                line-height: 18px
                 display: block
                 min-width: 120px
-        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
-        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell
+        td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 8px
         .oe_form_subtotal_footer
+            width: auto
             float: right
-            > div
-                text-align: right
-                padding: 3px
-            label
-                font-weight: normal !important
-            span
-                display: inline-block
-                min-width: 80px
+            td.oe_form_group_cell
                 text-align: right
+                padding: 0
+            td.oe_form_group_cell_label
+                border: none
+            .oe_form_field
+                width: auto !important
             .oe_form_subtotal_footer_separator
                 border-top: 1px solid #cacaca
                 font-size: 120%
                 font-weight: bold
-                label
-                    font-weight: bold !important
+            label.oe_form_subtotal_footer_separator
+                font-weight: bold !important
+                padding: 2px 8px 2px 0px !important
     // }}}
     // ListView {{{
     .oe-listview-content
@@ -1730,7 +1817,7 @@ $colour4: #8a89ba
                     width: 17px
                     &:after
                         border-width: 0
-                > td.oe-number
+                > td.oe_number
                     text-align: right !important
             > tr:nth-child(odd)
                 background-color: #f0f0fa
@@ -1806,6 +1893,25 @@ $colour4: #8a89ba
         float: right
         color: #333
     // }}}
+//view editor
+.openerp
+    .oe_view_editor
+        width: 100%
+        border-collapse: collapse
+        margin-left: -12px
+        width: 100%
+        background-color: white
+        border-spacing: 0
+        td
+            text-align: center
+            white-space: nowrap
+            border: 1px solid #D8D8D8
+            cursor: pointer
+            font-size: 90%
+    .oe_view_editor_field td
+        border: 0px !important
+    .oe_view_editor tr:hover
+        background-color: #ecebf2
 
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)