[MERGE} from trunk

bzr revid: xmo@openerp.com-20120711112959-tcb9epdfc9frt6ux

1 files changed, 182 insertions, 45 deletions

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9377c11e2c2..0472aa34710 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -6,6 +6,7 @@ $facets-border: #afafb6
 $facets-border-selected: #a6a6fe
 $hover-background: #f0f0fa
 $colour4: #8a89ba
+$sheet-max-width: 860px
 // }}}
 // Mixins {{{
 @font-face
@@ -27,6 +28,14 @@ $colour4: #8a89ba
     font-weight: normal
     font-style: normal
 
+@mixin reset()
+    border: none
+    padding: 0
+    margin: 0
+    background: none
+    @include radius(none)
+    @include box-shadow(none)
+
 @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 */
@@ -89,7 +98,7 @@ $colour4: #8a89ba
 
 // }}}
 
-.openerp.openerp-web-client-container
+.openerp.openerp_webclient_container
     height: 100%
     position: relative
 
@@ -134,9 +143,10 @@ $colour4: #8a89ba
     li
         list-style-type: none
     input, textarea, select
-        padding: 4px
+        padding: 2px 4px
         border: 1px solid #ccc
         @include radius(3px)
+        background: white
     img
         vertical-align: middle
     h4
@@ -190,6 +200,75 @@ $colour4: #8a89ba
             width: auto
             a.ui-state-active
                 background: #f0f0fa
+
+    // Modal box
+    &.ui-dialog
+        display: none
+        position: fixed
+        padding: 6px
+        top: 50%
+        left: 50%
+        z-index: 1050
+        width: 560px
+        margin: -150px 0 0 -280px
+        //overflow: hidden
+        background-color: rgba(60,60,60,0.7)
+        border: 1px solid
+        border-color: #888 #555 #444
+        //overflow: hidden
+        @include radius(8px)
+        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
+        @include background-clip()
+        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
+            padding: 16px
+        .ui-dialog-titlebar
+            border-bottom: 1px solid #cacaca
+            @include radius(2px 2px 0 0)
+            @include vertical-gradient(#FCFCFC, #DEDEDE)
+            .ui-dialog-title
+                margin: 0
+                padding: 0
+        .ui-widget-header
+            border: none
+        .ui-dialog-content
+            background: white
+        .ui-dialog-buttonpane
+            border-top: 1px solid #e0e0e0
+            background: #f5f7f9
+            padding: 8px
+            margin: 0
+            @include radius(0 0 2px 2px)
+            button
+                margin-left: 8px
+        .ui-dialog-titlebar-close
+            padding: 0
+            .ui-icon-closethick
+                display: none
+            &:before
+                content: "×"
+                font-size: 18px
+                font-weight: bold
+                line-height: 16px
+                color: black
+                text-shadow: 0 1px 0 white
+                padding: 0
+                cursor: pointer
+                background: transparent
+                border: 0
+                &:hover
+                    color: black
+                    text-decoration: none
+
+    .modal-backdrop
+        position: fixed
+        top: 0
+        right: 0
+        bottom: 0
+        left: 0
+        z-index: 1040
+        background-color: black
+        @include opacity(.3)
+
     // }}}
     // Generic classes {{{
     .oe_i
@@ -242,7 +321,7 @@ $colour4: #8a89ba
             &:hover
                 background: #ED6F6A
     .oe_title
-        width: 55%
+        width: 60%
     .oe_title:after
         content: "."
         display: block
@@ -250,8 +329,10 @@ $colour4: #8a89ba
         clear: both
         visibility: hidden
     .oe_button_box
-        width: 200px
-        text-align: center
+        width: 38%
+        text-align: right
+        button
+            margin: 4px
     .oe_avatar
         margin: 0 16px 0 0
         img
@@ -259,6 +340,28 @@ $colour4: #8a89ba
             @include radius(3px)
             @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
             border: none
+    .oe_button.oe_link
+        @include reset()
+        img
+            display: none
+        span
+            @include reset()
+            color: #8A89BA
+            font-weight: bold
+            &:hover
+                text-decoration: underline
+    .oe_webclient
+        .oe_star_on, .oe_star_off
+            color: #cccccc
+            text-shadow: 0 0 2px black
+            vertical-align: top
+            position: relative
+            top: -5px
+        .oe_star_on:hover, .oe_star_off:hover
+            text-decoration: none
+        .oe_star_on
+            color: gold
+
     //.oe_edit_only 
     // }}}
     // Tooltips {{{
@@ -284,6 +387,8 @@ $colour4: #8a89ba
         padding: 0 16px
         list-style: none
         zoom: 1
+    .oe_notebook.ui-corner-all
+        @include radius(0)
     .oe_notebook:before, .oe_notebook:after
         display: table
         content: ""
@@ -327,17 +432,21 @@ $colour4: #8a89ba
     .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle
         position: relative
         cursor: pointer
+    .oe_dropdown_toggle
+        color: #404040
+        font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 28px
+        top: 26px
+        left: 0
         z-index: 1
         border: 1px solid #afafb6
         background: white
-        padding: 8px
-        min-width: 120px
+        padding: 6px 0
+        min-width: 140px
         text-align: left
         @include radius(3px)
         @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
@@ -352,7 +461,7 @@ $colour4: #8a89ba
             > a
                 white-space: nowrap
                 display: block
-                padding: 3px 6px
+                padding: 4px 15px
                 color: #4c4c4c
                 text-decoration: none
                 &:hover
@@ -370,7 +479,6 @@ $colour4: #8a89ba
         border-right: 4px solid transparent
         border-top: 4px solid#404040
         @include opacity(0.5)
-
     .oe_sidebar
         white-space: nowrap
         .oe_dropdown_menu
@@ -591,6 +699,7 @@ $colour4: #8a89ba
         .oe_dropdown_arrow:after
             border-top: 4px solid white
         .oe_dropdown_menu
+            top: 32px
             background: #333
             background: rgba(37,37,37,0.9)
             border-color: #999
@@ -606,6 +715,7 @@ $colour4: #8a89ba
                     &:hover
                         @include vertical-gradient(#292929, #191919)
                         @include box-shadow(none)
+
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
@@ -891,7 +1001,7 @@ $colour4: #8a89ba
                 content: "f"
         // }}}
     // ViewManager application {{{
-    .oe_view_manager_global
+    .oe_view_manager_current
         height: 100%
         > .oe_view_manager_header
             border-top: 1px solid #cacaca
@@ -905,8 +1015,14 @@ $colour4: #8a89ba
                 td
                     padding-top: 8px
     // }}}
+    // ViewManager inline {{{
+    .oe_view_manager_inline
+        height: 100%
+        > .oe_view_manager_header
+            display: none
+    // }}}
     // Viewmanager popup {{{
-    .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager
+    .oe_popup_form > .oe_formview > .oe_form_pager
         display: none !important
     // }}}
     // SearchView {{{
@@ -924,7 +1040,7 @@ $colour4: #8a89ba
         input, textarea
             padding: 3px
             height: 14px
-            font-size: 11px
+            font-size: 12px
             line-height: 18px
         &.oe_focused
             border-color: $facets-border-selected
@@ -1129,6 +1245,11 @@ $colour4: #8a89ba
                         position: absolute
                         top: 0
                         right: 5px
+            .oe_searchview_dashboard
+                form
+                    display: none
+                    margin-top: 2px
+
             .oe_searchview_advanced
                 form
                     display: none
@@ -1214,7 +1335,7 @@ $colour4: #8a89ba
         input, select, textarea
             background-color: #F66 !important
             border: 1px solid #D00 !important
-    .oe_form_editable
+    .oe_view_manager_current .oe_form_editable
         .oe_highlight
             color: #404040
             background: none
@@ -1232,9 +1353,14 @@ $colour4: #8a89ba
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
-    .oe_form_nosheet > *:not(header)
-        margin-left: 10px !important
-        margin-right: 10px !important
+        .oe_form .oe_form_field_date
+            width: auto
+    .oe_form_nosheet 
+        margin-left: 10px
+        margin-right: 10px
+    .oe_form_nosheet > header
+        margin-left: -10px
+        margin-right: -10px
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form 
@@ -1249,7 +1375,7 @@ $colour4: #8a89ba
                 float: right
         footer
             min-width: 650px
-            max-width: 960px
+            max-width: $sheet-max-width
             margin: 0 auto
     ul.oe_form_steps
         height: 30px
@@ -1304,7 +1430,7 @@ $colour4: #8a89ba
             border-bottom: 1px solid #ddd 
         .oe_form_sheet_width
             min-width: 650px
-            max-width: 960px
+            max-width: $sheet-max-width
             margin: 0 auto
         .oe_form_sheet
             background: white
@@ -1325,19 +1451,22 @@ $colour4: #8a89ba
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 110px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 8px
+            padding-left: 6px
         .oe_form_group
             width: 100%
             margin: 4px 0 4px 0
+            .oe_group_right
+                > tbody > tr > td:first-child
+                    padding-left: 18px
     // }}}
     // FormView.label {{{
     .oe_form
         .oe_form_label_help[for], .oe_form_label[for]
             font-weight: bold
             white-space: nowrap
-            padding-right: 8px
+            padding-right: 6px
             span
                 font-size: 80%
                 color: darkGreen
@@ -1385,9 +1514,10 @@ $colour4: #8a89ba
             width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
+        .oe_form_field_email input,
         .oe_form_field_text textarea,
         .oe_form_field_selection select
-            width: inherit
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
@@ -1413,7 +1543,7 @@ $colour4: #8a89ba
         .oe_form_field_float
             width: 180px
         .oe_form_field_date
-            width: 7em
+            width: 7.5em
         .oe_form_field_datetime
             width: 11em
         input[type="text"], input[type="password"], input[type="file"], select
@@ -1433,14 +1563,6 @@ $colour4: #8a89ba
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
-            border-right: none
-            -webkit-border-top-right-radius: 0px
-            -webkit-border-bottom-right-radius: 0px
-            -moz-border-radius-topright: 0px
-            -moz-border-radius-bottomright: 0px
-            border-top-right-radius: 0px
-            border-bottom-right-radius: 0px
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1491,14 +1613,25 @@ $colour4: #8a89ba
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
-        .oe_form_field_with_button
+        .oe_form_field_with_button.oe_no_button > .oe_button
+            display: none
+        .oe_form_field_with_button:not(.oe_no_button)
             input
-                width: 100%
+                border-right: none
+                -webkit-border-top-right-radius: 0px
+                -webkit-border-bottom-right-radius: 0px
+                -moz-border-radius-topright: 0px
+                -moz-border-radius-bottomright: 0px
+                border-top-right-radius: 0px
+                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
+        .oe_form_field_with_button
+            input
+                width: 100%
             > div
                 position: relative
                 overflow: hidden
@@ -1513,7 +1646,7 @@ $colour4: #8a89ba
         display: inline-block
         width: 45px
         height: 30px
-        input.oe-binary-file
+        input.oe_form_binary_file
             z-index: 0
             line-height: 0
             font-size: 12px
@@ -1551,10 +1684,10 @@ $colour4: #8a89ba
     .oe_form_field_many2one
         td:first-child
             position: relative
-        span.oe-m2o-drop-down-button
+        span.oe_m2o_drop_down_button
             position: absolute
-            top: 3px
-            right: 2px
+            top: 1px
+            right: 0px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
@@ -1562,8 +1695,10 @@ $colour4: #8a89ba
             display: none
     .oe_form_field_one2many
         // TODO: oe_form_field_one2many_list?
-        .oe-listview .oe-edit-row-save
-            background-image: url(/web/static/src/img/iconset-b-remove.png)
+        .oe_list .oe_list_edit_row_save
+            background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat
+            &:before
+                visibility: hidden
 
         &> .oe_view_manager
             .oe_header_row_top
@@ -1582,7 +1717,7 @@ $colour4: #8a89ba
                             line-height: 16px
     // }}}
     // FormView.many2many {{{
-    .oe_form .oe_form_field_many2many > .oe-listview
+    .oe_form .oe_form_field_many2many > .oe_list
         .oe_list_pager_single_page
             display: none
     // }}}
@@ -1596,7 +1731,7 @@ $colour4: #8a89ba
             .oe_list_save
                 display: inline-block
 
-    .oe-listview
+    .oe_list
         position: relative
         .oe_form .oe_form_field
             width: auto
@@ -1604,7 +1739,7 @@ $colour4: #8a89ba
             margin: 0 !important // dammit
             padding: 0
 
-    .oe-listview-content
+    .oe_list_content
         width: 100%
         td:first-child, th:first-child
             &:after
@@ -1640,10 +1775,9 @@ $colour4: #8a89ba
             @include opacity(0.6)
         > tbody
             cursor: pointer
-            background: white
             > tr
                 border-top: 1px solid #ddd
-                > td.oe-field-cell
+                > td.oe_list_field_cell
                     padding: 3px 6px
                 > td, > th
                     line-height: 18px
@@ -1742,5 +1876,8 @@ $colour4: #8a89ba
         opacity: 0.70
 // }}}
 
+div.ui-widget-overlay
+    background: black
+    @include opacity(0.3)
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: