[merge] trunk

bzr revid: fp@tinyerp.com-20120809142923-qgk5ckssel2k36mk

1 files changed, 218 insertions, 50 deletions

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ddee25c3105..e0e8a3534dc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -142,6 +142,14 @@ $sheet-max-width: 860px
     font-size: 13px
     background: white
     // }}}
+    //Placeholder style{{{
+    \:-moz-placeholder
+        color: $facets-border !important
+        font-style: italic !important
+    \::-webkit-input-placeholder
+        color: $facets-border !important
+        font-style: italic !important
+    //}}}
     // Tag reset {{{
     a
         text-decoration: none
@@ -152,7 +160,7 @@ $sheet-max-width: 860px
         font-weight: bold
         background-color: #f0f0f0
         th
-            border-right: 1px dotted #afafb6
+            border-right: 1px dotted $facets-border
             &:last-child
                 border-right: none
     th, td
@@ -407,6 +415,12 @@ $sheet-max-width: 860px
             border: none
     .oe_avatar + div
         margin-left: 5px
+    .oe_image_small > img
+        max-width: 50px
+        max-height: 50px
+    .oe_image_medium > img
+        max-width: 180px
+        max-height: 180px
     .oe_button.oe_link
         @include reset()
         img
@@ -428,9 +442,6 @@ $sheet-max-width: 860px
             text-decoration: none
         .oe_star_on
             color: gold
-    .oe_bounce
-        -moz-animation: bounce .40s linear
-        -webkit-animation: bounce .40s linear
     // }}}
     // Tags (for many2many tags, among others) {{{
     .oe_tag
@@ -470,6 +481,16 @@ $sheet-max-width: 860px
                 list-style: circle
         .oe_tooltip_technical_title
             font-weight: bold
+        .oe_tooltip_close
+            margin: -5px 0 0 2px
+            cursor: default
+            float: right
+            color: white
+            &:hover
+                color: #999
+                cursor: pointer
+        .oe_tooltip_message
+            max-width: 310px
     // }}}
     // Notebook {{{
     .oe_notebook
@@ -533,7 +554,7 @@ $sheet-max-width: 860px
         top: 26px
         left: 0
         z-index: 1
-        border: 1px solid #afafb6
+        border: 1px solid $facets-border
         background: white
         padding: 4px 0
         min-width: 140px
@@ -813,7 +834,7 @@ $sheet-max-width: 860px
         display: none
         width: 220px
         background: #f0eeee
-        border-right: 1px solid #afafb6
+        border-right: 1px solid $facets-border
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
     a.oe_logo
@@ -1254,7 +1275,7 @@ $sheet-max-width: 860px
             background-color: white
             min-width: 100%
             display: none
-            border: 1px solid #afafb6
+            border: 1px solid $facets-border
             text-align: left
             @include radius(4px)
             @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
@@ -1409,15 +1430,26 @@ $sheet-max-width: 860px
     // }}}
     // Views Common {{{
     .oe_view_nocontent
-        > img
-            float: left
-            margin: 1.5em
-        > div
-            // don't encroach on my arrow
-            overflow: hidden
-            padding: 35px 0px 0px 0px
-            max-width: 700px
-            font-size: 125%
+        padding: 15px
+        margin-top: 0
+        color: #777777
+        font-size: 125%
+        max-width: 700px
+        .oe_view_nocontent_create
+            background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0
+            margin-top: 0
+            padding-top: 35px
+            min-height: 28px
+            color: #4c4c4c
+        > p
+            padding-left: 95px
+        .oe_empty_custom_dashboard
+            background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0
+            margin-top: -15px
+            padding: 100px 0 0 137px
+            min-height: 327px
+            margin-left: -15px
+
     // }}}
     // FormView.base and dynamic tags {{{
     .oe_formview
@@ -1471,6 +1503,14 @@ $sheet-max-width: 860px
             min-width: 650px
             max-width: $sheet-max-width
             margin: 0 auto
+        div.oe_form_configuration
+            div.oe_horizontal_separator 
+                margin: 25px 0 10px 0
+            p
+                color: #aaa
+                max-width: 650px
+            label
+                min-width: 150px
     ul.oe_form_steps
         height: 30px
         padding: 0
@@ -1500,6 +1540,93 @@ $sheet-max-width: 860px
         .oe_form_steps_active
             font-weight: bold
             color: #b33630
+    ul.oe_form_steps_clickable
+        height: 30px
+        margin: 0
+        padding: 0
+        text-shadow: 0 1px 1px #cacaca
+        box-shadow: 0 0 1px rgba(0,0,0,0.5)
+        overflow: hidden
+        li
+            border-right: none
+            padding: 0 0 0 12px
+            position: relative
+            float: left
+            vertical-align: top
+            height: 30px
+            color: white
+            &:after
+                content: " "
+                width: 0
+                height: 0
+                border-top: 21px solid transparent
+                border-bottom: 21px solid transparent
+                border-left: 5px solid #807fb4
+                position: absolute
+                top: 50%
+                margin-top: -21px
+                left: 100%
+                z-index: 2
+            &:hover:after
+                border-left: 5px solid #807fb4
+            &:before
+                content: " "
+                width: 0
+                height: 0
+                border-top: 21px solid transparent
+                border-bottom: 21px solid transparent
+                border-left: 5px solid white
+                position: absolute
+                top: 50%
+                margin-top: -21px
+                margin-left: 2px
+                left: 100%
+                z-index: 2
+            &.oe_form_steps_active
+                font-weight: bold
+                text-shadow: 0 1px 1px #999999
+                box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25)
+                background-color: #dc5f59
+                background: -webkit-linear-gradient(top, #dc5f59, #b33630)
+                color: white
+            &.oe_form_steps_inactive
+                cursor: pointer
+                box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25)
+                background-color: #adadcf
+                background: -webkit-linear-gradient(top, #adadcf, #7c7ba7)
+                div
+                    padding: 0 30px 0 0
+            &.oe_form_steps_inactive:hover
+                background: -webkit-linear-gradient(top, #7c7ba7, #adadcf)
+            div
+                padding: 0 30px 0 0            
+            &.oe_form_steps_active:after
+                content: " "
+                display: block
+                width: 0
+                height: 0
+                border-top: 21px solid transparent
+                border-bottom: 21px solid transparent
+                border-left: 5px solid #b33630
+                position: absolute
+                top: 50%
+                margin-top: -21px
+                left: 100%
+                z-index: 2
+            &.oe_form_steps_active:before
+                content: " "
+                display: block
+                width: 0
+                height: 0
+                border-top: 21px solid transparent
+                border-bottom: 21px solid transparent
+                border-left: 5px solid white
+                position: absolute
+                top: 50%
+                margin-top: -21px
+                margin-left: 2px
+                left: 100%
+                z-index: 2
     .oe_form .oe_subtotal_footer
         width: 1% !important
         td.oe_form_group_cell
@@ -1533,7 +1660,7 @@ $sheet-max-width: 860px
             background: white
             min-height: 330px
             padding: 16px
-            border: 1px solid #afafb6
+            border: 1px solid $facets-border
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
             .ui-tabs
                 margin: 0 -16px
@@ -1546,7 +1673,7 @@ $sheet-max-width: 860px
             margin: 2px
         td.oe_form_group_cell_label
             border-right: 1px solid #ddd
-            padding: 2px 0px 2px 0px
+            padding: 4px 0px 4px 0px
             label
                 line-height: 18px
                 display: block
@@ -1555,7 +1682,7 @@ $sheet-max-width: 860px
             padding-left: 6px
         .oe_form_group
             width: 100%
-            margin: 6px 0 6px 0
+            margin: 9px 0 9px 0
             .oe_form_group_cell.oe_group_right
                 padding-left: 20px
     // }}}
@@ -1580,7 +1707,7 @@ $sheet-max-width: 860px
         font-weight: bold
         font-size: 20px
         margin: 8px 0px 8px 0px
-        color: #aab
+        color: #53637e
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator
@@ -1627,7 +1754,7 @@ $sheet-max-width: 860px
             width: 100%
             display: inline-block
             padding: 2px 2px 2px 0px
-            line-height: 18px
+            line-height: 1em
             input
                 margin: 0px
         input[type="text"], input[type="password"], input[type="file"], select
@@ -1694,9 +1821,9 @@ $sheet-max-width: 860px
     .oe_form_editable
         .oe_form
             .oe_form_field_integer
-                width: 7em !important
+                width: 6em !important
             .oe_form_field_float
-                width: 8em !important
+                width: 7em !important
             .oe_form_field_date
                 width: 7.5em !important
             .oe_form_field_datetime
@@ -1751,6 +1878,8 @@ $sheet-max-width: 860px
             right: 0px
         .oe_m2o_cm_button
             line-height: 14px
+            float: right
+            padding-left: 2px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
@@ -1758,6 +1887,11 @@ $sheet-max-width: 860px
             display: none
     .oe_form_field_one2many,.oe_form_field_many2many
         // TODO: oe_form_field_one2many_list?
+        > .oe_view_manager
+            .oe_list_pager_single_page
+                display: none !important
+        .oe_form_field_one2many_list_row_add
+            font-weight: bold
         .oe_list_content
             > thead
                 border-bottom: 1px
@@ -1787,6 +1921,46 @@ $sheet-max-width: 860px
         .oe_list_buttons.oe_editing .oe_list_save
             // keep "save row" button hidden in o2m
             visibility: hidden
+    .oe_form_editable
+        .oe_list_editable
+            .oe_list_content
+                td.oe_required
+                    background-color: #d2d2ff
+                td.oe_readonly
+                    background-color: #eee
+    .oe_list_editable
+        .oe_list_content
+            td.oe_list_field_cell
+                padding: 4px 6px 3px 6px
+    .oe_list.oe_list_editable
+        td.oe_list_record_delete
+            position: absolute
+    .oe_list.oe_list_editable.oe_editing
+        .oe_m2o_drop_down_button
+            top: 5px
+        .oe_m2o_cm_button
+            display: none
+        .oe_form_field
+            input
+                height: 27px
+            input, textarea
+                border: 1px solid #aaf
+                border-radius: 0px
+                margin: 0px
+                -webkit-border-radius: 0px
+            textarea
+                height: 60px
+            &.oe_form_field_float,&.oe_form_view_integer
+                input
+                    text-align: right
+            &.oe_form_field_datetime,&.oe_form_field_date
+                > span
+                    width: 100%
+                input.oe_datepicker_master
+                    width: 100% !important
+            .oe_form_field_float,.oe_form_view_integer,&.oe_form_field_datetime,&.oe_form_field_date
+                min-width: 0 !important
+                max-width: none !important
     // }}}
     // FormView.many2many {{{
     .oe_form .oe_form_field_many2many > .oe_list
@@ -1807,11 +1981,16 @@ $sheet-max-width: 860px
 
     .oe_list
         position: relative
-        .oe_form .oe_form_field
-            width: auto
-            position: absolute
-            margin: 0 !important // dammit
-            padding: 0
+        .oe_form
+            .oe_form_nosheet
+                margin: 0 // FIXME: either class or border should not be by default
+                padding: 0
+                border: none
+            .oe_form_field
+                width: auto
+                position: absolute
+                margin: 0 !important // dammit
+                padding: 0
 
     .oe_list_content
         width: 100%
@@ -1876,14 +2055,22 @@ $sheet-max-width: 860px
             background: #eee
             font-weight: bold
 
-        > tbody tr:hover td, tbody tr:hover th
-            @include vertical-gradient(#eee, #dedede)
 
         .numeric
             text-align: right
             width: 82px
             input
                 text-align: right
+        th.oe_list_header_handle
+            font-size: 1px
+            overflow: hidden
+            text-indent: -9001px
+        td.oe_list_field_handle
+            width: 1em
+            cursor: ns-resize
+            .oe_list_handle
+                @include text-to-icon("ö")
+
     // }}}
     // Tree view {{{
     .tree_header
@@ -1908,7 +2095,7 @@ $sheet-max-width: 860px
             border-bottom: 2px solid #cacaca
         .treeview-tr, .treeview-td
             cursor: pointer
-            border-right: 1px dotted #afafb6
+            border-right: 1px dotted $facets-border
             vertical-align: top
             text-align: left
             border-bottom: 1px solid #cfcccc
@@ -1932,25 +2119,6 @@ $sheet-max-width: 860px
     .oe_trad_field.touched
         border: 1px solid green !important
     // }}}
-    // View Editor {{{
-    .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
-    // }}}
     // Debugging stuff {{{
     .oe_layout_debugging
         .oe_form_group