[Merge]with trunk

bzr revid: mba@tinyerp.com-20140507104547-p7pmav8pez08zf1h

2 files changed, 237 insertions, 180 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7fae47dc059..49c9573afde 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -79,7 +79,7 @@
   vertical-align: top;
 }
 .openerp .oe_title {
-  width: 50%;
+  width: 38%;
   float: left;
 }
 .openerp .oe_title:after {
@@ -314,47 +314,57 @@
 .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_button_box {
-  width: 400px;
-  text-align: left;
-}
-.openerp .oe_button_box .oe_stat_button:hover {
-  background: #7c7bad;
-  color: white;
-}
-.openerp .oe_button_box .oe_stat_button:hover .fa {
-  color: white;
-}
-.openerp .oe_button_box .oe_stat_button {
+.openerp .oe_stat_button {
   font-weight: normal;
-  display: inline-table;
-  width: 33% !important;
-  height: 42px;
+  width: 132px !important;
+  height: 40px;
+  color: #666666;
   margin: 0px -1px -1px 0px;
   padding: 0;
-  color: #666666;
   border: 1px solid #dddddd;
   border-radius: 0;
   box-shadow: none;
   background: white;
 }
-.openerp .oe_button_box .oe_stat_button > div {
+.openerp .oe_stat_button > div {
   display: table-cell;
   vertical-align: middle;
   text-align: left;
   padding: 0;
   line-height: 120%;
 }
-.openerp .oe_button_box .oe_stat_button .stat_button_icon {
+.openerp .oe_stat_button .stat_button_icon {
   color: #7c7bad;
   font-size: 24px;
   padding: 0px 3px;
   width: 37px;
   text-align: center;
 }
-.openerp .oe_button_box .oe_stat_button svg {
+.openerp .oe_stat_button .oe_form_field_percent_pie {
+  width: 42px;
+}
+.openerp .oe_stat_button .oe_form_field_bar_chart {
+  width: 42px;
+}
+.openerp .oe_stat_button svg {
   width: 38px;
   height: 38px;
+  display: inline;
+  vertical-align: middle;
+}
+.openerp .oe_stat_button:hover {
+  background: #7c7bad;
+  color: white;
+}
+.openerp .oe_stat_button:hover .fa {
+  color: white;
+}
+.openerp .oe_button_box {
+  width: 400px;
+  text-align: right;
+}
+.openerp .oe_button_box .oe_stat_button {
+  display: inline-table;
 }
 .openerp .oe_avatar > img {
   max-height: 90px;
@@ -470,7 +480,7 @@
   display: inline-block;
   height: 12px;
   width: 12px;
-  vertical-align: bottom;
+  vertical-align: top;
   border-radius: 10px;
   margin: 1px 0;
 }
@@ -496,40 +506,6 @@
   font-style: italic;
   text-decoration: none;
 }
-.openerp.oe_tooltip {
-  font-size: 12px;
-}
-.openerp.oe_tooltip .oe_tooltip_string {
-  color: #ffdd55;
-  font-weight: bold;
-  font-size: 13px;
-}
-.openerp.oe_tooltip .oe_tooltip_help {
-  white-space: pre-wrap;
-}
-.openerp.oe_tooltip .oe_tooltip_technical {
-  padding: 0 0 4px 0;
-  margin: 5px 0 0 15px;
-}
-.openerp.oe_tooltip .oe_tooltip_technical li {
-  list-style: circle;
-}
-.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;
@@ -746,7 +722,7 @@
   border-bottom-left-radius: 8px;
 }
 .openerp .oe_notification {
-  z-index: 1050;
+  z-index: 1500;
 }
 .openerp .oe_webclient_timezone_notification a {
   color: white;
@@ -1916,7 +1892,7 @@
 .openerp .oe_form > :not(.oe_form_nosheet) header {
   padding-left: 2px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) {
   display: inline-block;
   float: right;
 }
@@ -2772,9 +2748,11 @@
   border: none;
   background: transparent;
   padding: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
+}
+.openerp .oe_list_content > tbody > tr > td > button.btn_txt, .openerp .oe_list_content > tbody > tr > th > button.btn_txt {
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  background: #e3e3e3;
+  padding: 3px 12px;
 }
 .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child {
   width: 17px;
@@ -3319,6 +3297,88 @@ body.oe_single_form .oe_single_form_container {
     overflow: hidden !important;
   }
 }
+.tooltip {
+  padding: 0;
+  margin: 0;
+  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+  color: #4c4c4c;
+  font-size: 12px;
+  background: white;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+  background-color: transparent;
+}
+.tooltip .tooltip-inner {
+  text-align: left !important;
+  max-width: 350px;
+}
+.tooltip .tooltip-inner .oe_tooltip_string {
+  color: #ffdd55;
+  font-weight: bold;
+  font-size: 13px;
+}
+
+.tooltip .tooltip-inner .oe_tooltip_help {
+  white-space: pre-wrap;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical {
+  padding: 0 0 4px 0;
+  margin: 5px 0 0 15px;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical li {
+  list-style: circle;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical_title {
+  font-weight: bold;
+}
+.tooltip .tooltip-inner .oe_tooltip_close {
+  margin: -5px 0 0 2px;
+  cursor: default;
+  float: right;
+  color: white;
+}
+.tooltip .tooltip-inner .oe_tooltip_close:hover {
+  color: #999999;
+  cursor: pointer;
+}
+.tooltip .tooltip-inner .oe_tooltip_message {
+  max-width: 310px;
+}
+
+.ui-icon {
+  width: 18px;
+  height: 18px;
+}
+
+.modal .modal-header button.close {
+  border: none;
+  background: none;
+  padding: 1px;
+  height: 18px;
+  font-size: 20px;
+}
+.modal .modal-footer {
+  text-align: left;
+}
+.modal .oe_button {
+  margin: 0 4px 0 0;
+}
+.modal .oe_act_window.modal-body {
+  padding: 0;
+}
+
+.ui-datepicker {
+  z-index: 1500 !important;
+}
+
+input[type="radio"], input[type="checkbox"] {
+  margin-right: 4px;
+  margin-left: 4px;
+}
+
+.blockUI.blockOverlay {
+  background-color: black;
+  opacity: 0.6;
+}
 .openerp .dropdown-menu.state {
   background: white;
   background: white !important;
@@ -3330,7 +3390,6 @@ body.oe_single_form .oe_single_form_container {
   color: #333333;
   padding-left: 5px;
   padding-right: 0px;
-  font-size: 13px;
 }
 .openerp .btn-group.state {
   padding-top: 3px;
@@ -3379,30 +3438,3 @@ body.oe_single_form .oe_single_form_container {
   float: left;
   margin-right: 8px;
 }
-
-.ui-icon {
-  width: 18px;
-  height: 18px;
-}
-.modal .modal-header button.close {
-  border: none;
-  background: none;
-  padding: 1px;
-  height: 18px;
-  font-size: 20px;
-}
-.modal .modal-footer {
-  text-align: left;
-}
-.modal .oe_act_window.modal-body{
-  padding: 0;
-}
-input[type="radio"], input[type="checkbox"] {
-  margin-right: 4px;
-  margin-left: 4px;
-}
-
-.blockUI.blockOverlay {
-  background-color: black;
-  opacity: 0.6;
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 92fb4c0c289..a73bf027f59 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -190,7 +190,7 @@ $sheet-padding: 16px
     td
         vertical-align: top
     .oe_title
-        width: 50%
+        width: 38%
         float: left    
     .oe_title:after
         content: "."
@@ -330,41 +330,48 @@ $sheet-padding: 16px
             @include box-shadow(none)
             &:hover
                 background: #ED6F6A
+    .oe_stat_button
+        font-weight: normal
+        width: 132px !important
+        height: 40px
+        color: #666
+        margin: 0px -1px -1px 0px
+        padding: 0
+        border: 1px solid #dddddd
+        border-radius: 0
+        box-shadow: none
+        background: white
+        > div
+            display: table-cell
+            vertical-align: middle
+            text-align: left
+            padding: 0
+            line-height: 120%
+        .stat_button_icon
+            color: #7C7BAD
+            font-size: 24px
+            padding: 0px 3px
+            width: 37px
+            text-align: center
+        .oe_form_field_percent_pie
+            width: 42px
+        .oe_form_field_bar_chart
+            width: 42px
+        svg
+            width: 38px
+            height: 38px
+            display: inline
+            vertical-align: middle
+    .oe_stat_button:hover
+        background: #7c7bad
+        color: white
+        .fa
+            color: white
     .oe_button_box
         width: 400px
-        text-align: left
-        .oe_stat_button:hover
-            background: #7c7bad
-            color: white
-            .fa
-                color: white
+        text-align: right
         .oe_stat_button
-            font-weight: normal
             display: inline-table
-            width: 33% !important
-            height: 42px
-            margin: 0px -1px -1px 0px
-            padding: 0
-            color: #666
-            border: 1px solid #dddddd
-            border-radius: 0
-            box-shadow: none
-            background: white
-            > div
-                display: table-cell
-                vertical-align: middle
-                text-align: left
-                padding: 0
-                line-height: 120%
-            .stat_button_icon
-                color: #7C7BAD
-                font-size: 24px
-                padding: 0px 3px
-                width: 37px
-                text-align: center
-            svg
-                width: 38px
-                height: 38px
     .oe_avatar
         > img
             max-height: 90px
@@ -446,7 +453,7 @@ $sheet-padding: 16px
                 display: inline-block
                 height: 12px
                 width: 12px
-                vertical-align: bottom
+                vertical-align: top
                 border-radius: 10px
                 margin: 1px 0
             &.oe_form_invalid
@@ -466,33 +473,6 @@ $sheet-padding: 16px
                 text-decoration: none
         margin-bottom: 1px
     // }}}
-    // Tooltips {{{
-    &.oe_tooltip
-        font-size: 12px
-        .oe_tooltip_string
-            color: #FD5
-            font-weight: bold
-            font-size: 13px
-        .oe_tooltip_help
-            white-space: pre-wrap
-        .oe_tooltip_technical
-            padding: 0 0 4px 0
-            margin: 5px 0 0 15px
-            li
-                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
         margin: 8px 0
@@ -660,7 +640,8 @@ $sheet-padding: 16px
     // }}}
     // Notifications {{{
     .oe_notification
-        z-index: 1050
+        z-index: 1500
+        
     .oe_webclient_timezone_notification
         a
             color: white
@@ -1571,7 +1552,7 @@ $sheet-padding: 16px
     // FormView.header {{{
     .oe_form > :not(.oe_form_nosheet) header
         padding-left: 2px
-        ul
+        ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu)
             display: inline-block
             float: right
         .oe_button
@@ -2245,7 +2226,10 @@ $sheet-padding: 16px
                         border: none
                         background: transparent
                         padding: 0
-                        @include box-shadow(none)
+                    > button.btn_txt
+                        border: 1px solid rgba(0,0,0,0.4)
+                        background: #e3e3e3
+                        padding: 3px 12px
                 > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child
                     width: 17px
                     &:after
@@ -2697,6 +2681,76 @@ body.oe_single_form
             overflow: hidden !important
 // }}}
 
+// End of customize
+
+// Customize bootstrap3 for tooltip
+.tooltip
+    padding: 0
+    margin: 0
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
+    color: #4c4c4c
+    font-size: 12px
+    background: white
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
+    background-color: transparent
+    .tooltip-inner
+        text-align: left !important
+        max-width: 350px
+        .oe_tooltip_string
+            color: #FD5
+            font-weight: bold
+            font-size: 13px
+        .oe_tooltip_help
+            white-space: pre-wrap
+        .oe_tooltip_technical
+            padding: 0 0 4px 0
+            margin: 5px 0 0 15px
+            li
+                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
+
+// Hack for ui icon {{{
+.ui-icon
+    width: 18px
+    height: 18px
+// End hack}}}
+
+// Customized modal according bootstrap3
+.modal
+    .modal-header button.close
+        border: none
+        background: none
+        padding: 1px
+        height: 18px
+        font-size: 20px
+    .modal-footer
+        text-align: left
+    .oe_button
+        margin: 0 4px 0 0
+    .oe_act_window.modal-body
+        padding: 0
+
+.ui-datepicker
+    z-index: 1500 !important
+
+input[type="radio"], input[type="checkbox"]
+    margin-right: 4px
+    margin-left: 4px
+
+.blockUI.blockOverlay
+    background-color: black
+    opacity: 0.6000000238418579
 .openerp
     .dropdown-menu.state
         background: white
@@ -2751,34 +2805,5 @@ body.oe_single_form
     .oe_star_left
         float: left
         margin-right: 8px
-// End hack }}}
-
-// Hack for ui icon {{{
-.ui-icon
-    width: 18px
-    height: 18px
-// End hack}}}
-
-// Customized modal according bootstrap3
-.modal
-    .modal-header button.close
-        border: none
-        background: none
-        padding: 1px
-        height: 18px
-        font-size: 20px
-    .modal-footer
-        text-align: left
-    .oe_act_window.modal-body
-        padding: 0
-
-input[type="radio"], input[type="checkbox"]
-    margin-right: 4px
-    margin-left: 4px
-
-.blockUI.blockOverlay
-    background-color: black
-    opacity: 0.6000000238418579
-
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: