[MERGE] from trunk

bzr revid: xmo@openerp.com-20120515070556-l2ew6ixbup3u56md

1 files changed, 298 insertions, 115 deletions

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 29797710efd..cb7f0e30f9e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -16,6 +16,16 @@ $colour4: #8a89ba
     font-weight: normal
     font-style: normal
 
+@font-face
+    font-family: 'EntypoRegular'
+    src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+    src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+    src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+    src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+    src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+    font-weight: normal
+    font-style: normal
+
 @mixin vertical-gradient($startColor: #555, $endColor: #333)
     background-color: $startColor
     background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
@@ -135,6 +145,10 @@ $colour4: #8a89ba
         font-family: "mnmliconsRegular" !important
         font-size: 21px
         font-weight: 300 !important
+    .oe_e
+        font-family: "entypoRegular" !important
+        font-size: 34px
+        font-weight: 300 !important
     .oe_left
         float: left
         margin-right: 8px
@@ -145,6 +159,11 @@ $colour4: #8a89ba
         clear: both
     .oe_wait
         cursor: wait
+    .oe_fade
+        color: #888
+        //font-size: 12px
+    .oe_bold
+        font-weight: bold
     // }}}
     // Button style {{{
     a.button:link, a.button:visited, button, input[type='submit']
@@ -363,15 +382,8 @@ $colour4: #8a89ba
         width: 100%
         height: 31px
         border-top: solid 1px #d3d3d3
-        border-bottom: solid 1px black
         @include vertical-gradient(#646060, #262626)
 
-        .oe_systray
-            float: right
-        .oe_systray > div
-            float: left
-            padding: 0 4px 0 4px
-
         .oe_topbar_item
             li
                 float: left
@@ -420,6 +432,7 @@ $colour4: #8a89ba
         background: #f0eeee
         border-right: 1px solid #afafb6
         text-shadow: 0 1px 1px white
+        padding-bottom: 16px
     a.oe_logo
         width: 220px
         display: block
@@ -456,6 +469,7 @@ $colour4: #8a89ba
             float: left
         .oe_dropdown
             position: relative
+
         .oe_dropdown_options
             float: left
             background: #333
@@ -491,6 +505,52 @@ $colour4: #8a89ba
                     &:hover
                         @include vertical-gradient(#292929, #191919)
                         @include box-shadow(none)
+                hr
+                    border-top: 1px solid #999
+                    border-bottom: 0
+    // }}}
+    // Systray {{{
+    .oe_systray > div
+        float: left
+        padding: 0 4px 0 4px
+    .oe_systray
+        float: right
+
+        .oe_systray_dropdown
+            position: relative
+        .oe_systray_dropdown:hover .oe_systray_dropdown_options
+            display: block
+        .oe_systray_dropdown_options
+            background: #333
+            background: rgba(37,37,37,0.9)
+            display: none
+            position: absolute
+            z-index: 900
+            border: 0
+            margin-left: 0
+            margin-right: 0
+            padding: 6px 0
+            border-color: #999
+            border-color: rgba(0, 0, 0, 0.2)
+            border-style: solid
+            border-width: 0 1px 1px
+            @include radius(0 0 6px 6px)
+            @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
+            @include background-clip()
+            li
+                float: none
+                display: block
+                background-color: none
+                a
+                    display: block
+                    padding: 4px 15px
+                    clear: both
+                    font-weight: normal
+                    line-height: 18px
+                    color: #eee
+                    &:hover
+                        @include vertical-gradient(#292929, #191919)
+                        @include box-shadow(none)
     // }}}
     // Menu {{{
     .oe_menu
@@ -539,9 +599,9 @@ $colour4: #8a89ba
         margin: 0
         width: 100%
         display: inline-block
-        li
+        > li
             position: relative
-            padding: 1px 0 1px 16px
+            padding: 1px 0 1px 20px
             a
                 display: block
                 color: #4c4c4c
@@ -592,7 +652,7 @@ $colour4: #8a89ba
             content: "&darr"
             text-indent: -99999px
             vertical-align: top
-            margin-left: -8px
+            margin-left: -12px
             margin-top: 4px
             margin-right: 4px
             border-top: 4px solid transparent
@@ -601,7 +661,7 @@ $colour4: #8a89ba
             @include opacity(0.5)
         .oe_menu_opened:before
             margin-top: 6px
-            margin-left: -12px
+            margin-left: -16px
             margin-right: 4px
             border-left: 4px solid transparent
             border-right: 4px solid transparent
@@ -681,21 +741,37 @@ $colour4: #8a89ba
                 text-shadow: 0 1px 2px rgba(0,0,0,0.4)
     // }}}
     // ViewManager.header {{{
-    .oe_view_manager_header2
+    .oe_view_manager_header
         width: 100%
         border-top: 1px solid #cacaca
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
         @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
+        .oe_header_row
+            //min-height: 26px
+            //line-height: 26px
+            clear: both
+            text-shadow: 0 1px 1px white
+            td
+                padding: 8px
+        .oe_header_row:last-child
+            td
+                padding-top: 0
+        .oe_header_row:first-child
+            td
+                padding-top: 8px
+        .oe_view_manager_sidebar
+            margin: 0px auto
+            width: 400px
+            text-align: center
+        td
+            line-height: 26px
         h2
-            float: left
             font-size: 18px
-            margin: 1px 0
+            margin: 0
+            float: left
             a
                 color: $colour4
-        td
-            padding: 4px 8px
-            line-height: 26px
         .oe_button_group
             display: inline-block
             border: 1px solid #ababab
@@ -724,6 +800,8 @@ $colour4: #8a89ba
             margin: 8px 0
     // }}}
     // ViewManager.pager {{{
+    .oe_view_manager_pager
+        line-height: 26px
     .oe_pager_value
         float: left
         margin-right: 8px
@@ -758,29 +836,52 @@ $colour4: #8a89ba
     // ViewManager.switches {{{
     .oe_view_manager_switch
         li
-            padding-left: 1px
             text-align: center
             width: 24px
             height: 24px
-            line-height: 24px
+            line-height: 16px
+            a
+                position: relative
         .oe_vm_switch_list:after, .oe_vm_switch_tree:after
-            content: "ö"
+            padding: 2px
+            content: "i"
         .oe_vm_switch_graph:after
-            content: "ó"
+            font-family: "mnmliconsRegular" !important
+            font-size: 21px
+            font-weight: 300 !important
+            content: "}"
+            top: -2px
+            position: relative
         .oe_vm_switch_gantt:after
+            font-family: "mnmliconsRegular" !important
+            font-size: 21px
+            font-weight: 300 !important
             content: "y"
+            top: -2px
+            position: relative
         .oe_vm_switch_calendar:after
-            content: "b"
+            content: "P"
         .oe_vm_switch_kanban:after
-            content: "ó"
+            content: "k"
         .oe_vm_switch_diagram:after
-            content: "}"
+            content: "f"
+        //.oe_vm_switch_list:after, .oe_vm_switch_tree:after
+            //content: "ö"
+        //.oe_vm_switch_graph:after
+            //content: "ó"
+        //.oe_vm_switch_gantt:after
+            //content: "y"
+        //.oe_vm_switch_calendar:after
+            //content: "b"
+        //.oe_vm_switch_kanban:after
+            //content: "ó"
+        //.oe_vm_switch_diagram:after
+            //content: "}"
     // }}}
     // ViewManager.sidebar {{{
     .oe_form_dropdown_section
         position: relative
         display: inline-block
-        margin-right: 4px
     .oe_dropdown_toggle:after
         width: 0
         height: 0
@@ -822,6 +923,7 @@ $colour4: #8a89ba
                 line-height: 14px
                 color: #4c4c4c
                 text-decoration: none
+                cursor: pointer
                 &:hover
                     text-decoration: none
                     @include vertical-gradient(#f0f0fa, #eeeef6)
@@ -1031,7 +1133,16 @@ $colour4: #8a89ba
             .oe_searchview_custom_delete, .searchview_extended_delete_prop
                 @include text-to-icon("d")
     // }}}
-    // View.topbar {{{
+    // Views Common {{{
+    .oe_view_nocontent
+        > img
+            float: left
+            margin-right: 1.5em
+        > div
+            // don't encroach on my arrow
+            overflow: hidden
+            padding: 6px
+            font-size: 125%
     .oe_view_topbar
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
@@ -1072,7 +1183,7 @@ $colour4: #8a89ba
             line-height: 24px 
             vertical-align: top
             padding: 0 10px 
-            margin: 3px 0
+            margin: 3px 4px 3px 0
             span.i
                 line-height: 20px 
                 height: 24px 
@@ -1112,10 +1223,27 @@ $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_application
         .oe_form_sheetbg
             background: url(/web/static/src/img/form_sheetbg.png)
-            padding: 8px
+            padding: 8px 0
             border-bottom: 1px solid #ddd 
         .oe_form_sheet_width
             min-width: 650px
@@ -1127,33 +1255,15 @@ $colour4: #8a89ba
             min-height: 420px
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
-            //.avatar
-            //    max-height: 52px
-            //.contacts
-            //    li
-            //        float: left
-            //        width: 33%
-            //        margin-bottom: 4px
-            //    .avatar
-            //        height: 40px
-            //        width: 40px
-            //        border: 1px solid
-            //        border-color: #e5e5e5 #dbdbdb #d2d2d2
-            //    .data
-            //        padding: 2px
-            //        line-height: 18px
     // }}}
     // FormView.autolayout {{{
     .oe_form_autolayout
         .oe_button
-            height: 22px
+            height: 20px
         .oe_form_group_cell
             line-height: 18px
             padding: 2px
-            height: 25px
-            .oe_form_button
-                width: 100%
-                white-space: nowrap
+            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,
@@ -1162,29 +1272,35 @@ $colour4: #8a89ba
         .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_date input,
         .oe_form_group_cell > .oe_form_field_float input,
         .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > .oe_datepicker_root
+        .oe_form_group_cell > div > .oe_datepicker_root,
+        .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
             width: 100%
         .oe_form_button.oe_button
             color: #4c4c4c
-            white-space: nowrap
-            min-width: 100%
-            width: 100%
-            height: 22px
             span
                 position: relative
                 vertical-align: top
+        .oe_form_group_cell > .oe_form_button.oe_button
+            white-space: nowrap
+            min-width: 100%
+            width: 100%
         .oe_form_group_cell.oe_form_group_nested
             padding: 0
     // }}}
     // FormView.label {{{
     .oe_form
-        label
-            font-weight: bold
-    .oe_form_label_help[for], .oe_form_label[for]
-        white-space: nowrap
+        .oe_form_label_help[for], .oe_form_label[for]
+            white-space: nowrap
+            padding-right: 8px
+            span
+                font-size: 80%
+                color: darkGreen
+                vertical-align: top
+                position: relative
+                top: -4px
+                padding: 0 2px
     // }}}
     // FormView.fields {{{
     .oe_form
@@ -1219,9 +1335,15 @@ $colour4: #8a89ba
         textarea[readonly],
         input[disabled],
         select[disabled],
-        textarea[disabled]
             background: #E5E5E5 !important
             color: #666
+        textarea[disabled]
+            border: none
+            border-left: 8px solid #eee
+            padding-left: 8px
+            @include box-shadow(none)
+            @include radius(0px)
+            color: #666
         .oe_form_field_many2one input,
         .oe_form_field_binary input,
         .oe_form_field_binary input,
@@ -1246,6 +1368,27 @@ $colour4: #8a89ba
             padding-top: 4px
         .oe_form_field_datetime input
             min-width: 11em
+        .oe_form_field_many2manytags
+            .text-wrap
+                width: 100% !important
+                textarea
+                    width: 100% !important
+            .oe_form_field_many2manytags_box
+                border-radius: 2px
+                box-sizing: border-box
+                position: relative
+                float: left
+                border: 1px solid #9DACCC
+                background: #E2E6F0
+                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
+                font-style: italic
+                text-decoration: none
         .oe_datepicker_container
             display: none
         .oe_datepicker_root
@@ -1280,6 +1423,9 @@ $colour4: #8a89ba
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
+        .oe_form_button > img
+            vertical-align: -3px
+            padding: 0 2px
     // }}}
     // FormView.binaryfile {{{
     /* http://www.quirksmode.org/dom/inputfile.html
@@ -1308,10 +1454,8 @@ $colour4: #8a89ba
     // FormView.separator {{{
     .oe_horizontal_separator
         font-weight: bold
-        border: 0 solid #666
-        border-bottom-width: 1px
-        margin: 3px 4px 3px 1px
-        height: 17px
+        font-size: 16px
+        margin: 4px 0
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator
@@ -1357,6 +1501,8 @@ $colour4: #8a89ba
         border: 1px solid #ddd
         border-bottom-color: transparent
         cursor: default
+    .oe_form_notebook_page
+        padding: 0
     .ui-tabs-hide
         display: none
 
@@ -1399,72 +1545,100 @@ $colour4: #8a89ba
                     li
                         height: auto
                         line-height: 16px
+    .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager
+        display: none
 
     // }}}
+    // 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
+            border-right: 1px solid #ddd
+            label
+                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
+            padding: 2px 2px 2px 8px !important
+    // }}}
     // ListView {{{
-    .oe_listview_nocontent
-        > img
-            float: left
-            margin-right: 1.5em
-        > div
-            // don't encroach on my arrow
-            overflow: hidden
-            padding: 6px
-            font-size: 125%
     .oe-listview-content
         width: 100%
-        thead, tfoot
-            border-bottom: 1px solid #cacaca
+        > thead
+            border-bottom: 2px solid #cacaca
             background: #eee
-        tfoot
-            border-bottom: 1px solid #cacaca
-            font-weight: bold
-        tbody
+            vertical-align: top
+            td, th
+                padding: 3px 6px
+                line-height: 18px
+            th:after
+                content: ""
+                float: right
+                margin-top: 7px
+                border-width: 0 4px 4px
+                border-style: solid
+                border-color: #000 transparent
+                visibility: hidden
+            th.sortup:after
+                visibility: visible
+                @include opacity(0.6)
+            th.sortdown:after
+                border-bottom: none
+                border-left: 4px solid transparent
+                border-right: 4px solid transparent
+                border-top: 4px solid #000
+                visibility: visible
+                @include box-shadow(none)
+                @include opacity(0.6)
+            // TODO mit
+            //th:hover:after
+            //    border-bottom: none
+            //    border-left: 4px solid transparent
+            //    border-right: 4px solid transparent
+            //    border-top: 4px solid #000
+            //    visibility: visible
+            //    @include box-shadow(none)
+            //    @include opacity(0.6)
+        > tbody
             cursor: pointer
             background: white
-        thead
-            vertical-align: top
-        td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child
-            width: 17px
-            &:after
-                border-width: 0
-        tbody tr:nth-child(odd) td, tbody tr:nth-child(odd) th
-            background-color: #f0f0fa
-            @include vertical-gradient(#f0f0fa, #eeeef6)
-        tbody tr:hover td, tbody tr:hover th
+            > tr
+                border-top: 1px solid #ddd
+                > td, > th
+                    padding: 3px 6px
+                    line-height: 18px
+                    > button
+                        border: none
+                        background: transparent
+                        padding: 0
+                        @include box-shadow(none)
+                > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child
+                    width: 17px
+                    &:after
+                        border-width: 0
+                > td.oe-number
+                    text-align: right !important
+            > tr:nth-child(odd)
+                background-color: #f0f0fa
+                @include vertical-gradient(#f0f0fa, #eeeef6)
+        > tfoot
+            border-top: 2px solid #cacaca
+            border-bottom: 1px solid #cacaca
+            background: #eee
+            font-weight: bold
+
+        > tbody tr:hover td, tbody tr:hover th
             @include vertical-gradient(#eee, #dedede)
-        td, th
-            padding: 3px 6px
-            line-height: 18px
-            button
-                border: none
-                background: transparent
-                padding: 0
-                @include box-shadow(none)
+
         .numeric
             text-align: right
             width: 82px
             input
                 text-align: right
-        //thead th:after
-            //content: ""
-            //float: right
-            //margin-top: 7px
-            //border-width: 0 4px 4px
-            //border-style: solid
-            //border-color: #000 transparent
-            //visibility: hidden
-        table .sortdown:after, table .sortdown:hover:after
-            visibility: visible
-            @include opacity(0.6)
-        table .sortup:after
-            border-bottom: none
-            border-left: 4px solid transparent
-            border-right: 4px solid transparent
-            border-top: 4px solid #000
-            visibility: visible
-            @include box-shadow(none)
-            @include opacity(0.6)
     // }}}
     // KanbanView {{{
     .oe_kanban_group_title
@@ -1533,6 +1707,15 @@ $colour4: #8a89ba
             outline: 1px solid blue
         .oe_form_group:hover, .oe_form_group_cell:hover
             outline-color: red
+        .oe_form_group_row_incomplete > td:last-child:after
+            content: "[Incomplete Row]"
+            background: red
+            padding: 2px
+            font-weight: bold
+            color: white
+            float: right
+        .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after
+            content: "[newline]"
 
     .oe_debug_view
         float: left