[MERGE]merged with latest trunk

bzr revid: dhr@tinyerp.com-20120809052141-os6yizjk8clv2xmd

2 files changed, 361 insertions, 87 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1e59897cd86..dfd0a5abeac 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -80,6 +80,14 @@
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
    */
 }
+.openerp :-moz-placeholder {
+  color: #afafb6 !important;
+  font-style: italic !important;
+}
+.openerp ::-webkit-input-placeholder {
+  color: #afafb6 !important;
+  font-style: italic !important;
+}
 .openerp a {
   text-decoration: none;
 }
@@ -501,6 +509,14 @@
 .openerp .oe_avatar + div {
   margin-left: 5px;
 }
+.openerp .oe_image_small > img {
+  max-width: 50px;
+  max-height: 50px;
+}
+.openerp .oe_image_medium > img {
+  max-width: 180px;
+  max-height: 180px;
+}
 .openerp .oe_button.oe_link {
   border: none;
   padding: 0;
@@ -546,10 +562,6 @@
 .openerp .oe_webclient .oe_star_on {
   color: gold;
 }
-.openerp .oe_bounce {
-  -moz-animation: bounce 0.4s linear;
-  -webkit-animation: bounce 0.4s linear;
-}
 .openerp .oe_tag {
   border-radius: 2px;
   -webkit-box-sizing: border-box;
@@ -594,6 +606,19 @@
 .openerp.oe_tooltip .oe_tooltip_technical_title {
   font-weight: bold;
 }
+.openerp.oe_tooltip .oe_tooltip_close {
+  margin: -5px 0 0 2px;
+  cursor: default;
+  float: right;
+  color: white;
+}
+.openerp.oe_tooltip .oe_tooltip_close:hover {
+  color: #999999;
+  cursor: pointer;
+}
+.openerp.oe_tooltip .oe_tooltip_message {
+  max-width: 310px;
+}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
@@ -1808,15 +1833,29 @@
   margin: 0 0 0 4px;
   padding: 0;
 }
-.openerp .oe_view_nocontent > img {
-  float: left;
-  margin: 1.5em;
-}
-.openerp .oe_view_nocontent > div {
-  overflow: hidden;
-  padding: 35px 0px 0px 0px;
-  max-width: 700px;
+.openerp .oe_view_nocontent {
+  padding: 15px;
+  margin-top: 0;
+  color: #777777;
   font-size: 125%;
+  max-width: 700px;
+}
+.openerp .oe_view_nocontent .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;
+}
+.openerp .oe_view_nocontent > p {
+  padding-left: 95px;
+}
+.openerp .oe_view_nocontent .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;
 }
 .openerp .oe_formview {
   background: white;
@@ -1908,6 +1947,16 @@
   max-width: 860px;
   margin: 0 auto;
 }
+.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
+  margin: 25px 0 10px 0;
+}
+.openerp .oe_form div.oe_form_configuration p {
+  color: #aaaaaa;
+  max-width: 650px;
+}
+.openerp .oe_form div.oe_form_configuration label {
+  min-width: 150px;
+}
 .openerp ul.oe_form_steps {
   height: 30px;
   padding: 0;
@@ -1945,6 +1994,105 @@
   font-weight: bold;
   color: #b33630;
 }
+.openerp 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;
+}
+.openerp ul.oe_form_steps_clickable li {
+  border-right: none;
+  padding: 0 0 0 12px;
+  position: relative;
+  float: left;
+  vertical-align: top;
+  height: 30px;
+  color: white;
+}
+.openerp ul.oe_form_steps_clickable li: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;
+}
+.openerp ul.oe_form_steps_clickable li:hover:after {
+  border-left: 5px solid #807fb4;
+}
+.openerp ul.oe_form_steps_clickable li: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;
+}
+.openerp ul.oe_form_steps_clickable li.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;
+}
+.openerp ul.oe_form_steps_clickable li.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);
+}
+.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive div {
+  padding: 0 30px 0 0;
+}
+.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive:hover {
+  background: -webkit-linear-gradient(top, #7c7ba7, #adadcf);
+}
+.openerp ul.oe_form_steps_clickable li div {
+  padding: 0 30px 0 0;
+}
+.openerp ul.oe_form_steps_clickable li.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;
+}
+.openerp ul.oe_form_steps_clickable li.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;
+}
 .openerp .oe_form .oe_subtotal_footer {
   width: 1% !important;
 }
@@ -2001,7 +2149,7 @@
 }
 .openerp .oe_form td.oe_form_group_cell_label {
   border-right: 1px solid #dddddd;
-  padding: 2px 0px 2px 0px;
+  padding: 4px 0px 4px 0px;
 }
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
@@ -2013,7 +2161,7 @@
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
-  margin: 6px 0 6px 0;
+  margin: 9px 0 9px 0;
 }
 .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
   padding-left: 20px;
@@ -2038,7 +2186,7 @@
   font-weight: bold;
   font-size: 20px;
   margin: 8px 0px 8px 0px;
-  color: #aaaabb;
+  color: #53637e;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
@@ -2097,7 +2245,7 @@
   width: 100%;
   display: inline-block;
   padding: 2px 2px 2px 0px;
-  line-height: 18px;
+  line-height: 1em;
 }
 .openerp .oe_form .oe_form_field input {
   margin: 0px;
@@ -2186,10 +2334,10 @@
   overflow: hidden;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_integer {
-  width: 7em !important;
+  width: 6em !important;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_float {
-  width: 8em !important;
+  width: 7em !important;
 }
 .openerp .oe_form_editable .oe_form .oe_form_field_date {
   width: 7.5em !important;
@@ -2308,6 +2456,11 @@
 .openerp .oe_list {
   position: relative;
 }
+.openerp .oe_list .oe_form .oe_form_nosheet {
+  margin: 0;
+  padding: 0;
+  border: none;
+}
 .openerp .oe_list .oe_form .oe_form_field {
   width: auto;
   position: absolute;
@@ -2419,6 +2572,25 @@
 .openerp .oe_list_content .numeric input {
   text-align: right;
 }
+.openerp .oe_list_content th.oe_list_header_handle {
+  font-size: 1px;
+  overflow: hidden;
+  text-indent: -9001px;
+}
+.openerp .oe_list_content td.oe_list_field_handle {
+  width: 1em;
+  cursor: ns-resize;
+}
+.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle {
+  font-size: 1px;
+  letter-spacing: -1px;
+  color: transparent;
+}
+.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before {
+  font: 21px "mnmliconsRegular";
+  content: "ö";
+  color: #404040;
+}
 .openerp .tree_header {
   background-color: #f0f0f0;
   border-bottom: 1px solid #cacaca;
@@ -2474,27 +2646,6 @@
 .openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }
-.openerp .oe_view_editor {
-  width: 100%;
-  border-collapse: collapse;
-  margin-left: -12px;
-  width: 100%;
-  background-color: white;
-  border-spacing: 0;
-}
-.openerp .oe_view_editor td {
-  text-align: center;
-  white-space: nowrap;
-  border: 1px solid #d8d8d8;
-  cursor: pointer;
-  font-size: 90%;
-}
-.openerp .oe_view_editor_field td {
-  border: 0px !important;
-}
-.openerp .oe_view_editor tr:hover {
-  background-color: #ecebf2;
-}
 .openerp .oe_layout_debugging .oe_form_group {
   outline: 2px dashed green;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3bb52497454..2570feec552 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -140,6 +140,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
@@ -150,7 +158,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
@@ -400,6 +408,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
@@ -421,9 +435,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
@@ -461,6 +472,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
@@ -524,7 +545,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
@@ -804,7 +825,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
@@ -1245,7 +1266,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))
@@ -1400,15 +1421,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
@@ -1462,6 +1494,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
@@ -1491,6 +1531,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
@@ -1524,7 +1651,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
@@ -1537,7 +1664,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
@@ -1546,7 +1673,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
     // }}}
@@ -1571,7 +1698,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
@@ -1618,7 +1745,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
@@ -1685,9 +1812,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
@@ -1804,11 +1931,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%
@@ -1881,6 +2013,16 @@ $sheet-max-width: 860px
             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
@@ -1905,7 +2047,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
@@ -1929,25 +2071,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