Merge lp:~openerp-dev/openerp-web/7.0-bug-1095675-bth into lp:openerp-web/7.0

[Bhumi Thakkar (Open ERP)]

Hello,

  [Generic web]Fixed the issue of progressbar which not displayed percentage and displayed in different color based on browser.

To reproduced:
1. Go to Sales => Sales => Opportunities
2. Switch to list view
3. Only the coloured bar is visible (the column title suggest there should be numbers, representing percentages)

Screenshot:
https://docs.google.com/open?id=0B7c_6dPUa6bcZ0I1b3FTTHEzMGM

Used div tag because displayed in same color in each browser and should display percentage to identify number of progress(percentage) otherwise user could not identify how much progress.

Thanks.

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
<progress/> is a progession item used in html5, don't use div to replace this field.
Thanks

review: Disapprove

[Bhumi Thakkar (Open ERP) (bth-openerp)]

Hi,

     progress element displayed only progreesbar not percentage so user could not identify how much progress is there so used div element to show progressbar with percentage. And progress element displayed in same color in each browser.

Thanks.

Unmerged revisions

3709. By Bhumi Thakkar (Open ERP) on 2013-01-22

[FIX] Fixed issue of progressbar displayed with percentage.--fixes:lp1095675

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-01-15 10:21:41 +0000
+++ addons/web/static/src/css/base.css	2013-01-22 11:41:21 +0000
@@ -2986,8 +2986,36 @@
   content: "}";
   color: #e0e0e0;
 }
-.openerp .oe_list_content .oe_list_field_progressbar progress {
-  width: 100%;
+.openerp .oe_list_progressbar_inner {
+  position: absolute;
+  top: 0;
+  left: 0;
+  border: 1px solid #aaaaaa;
+  background: #aaaaaa;
+  height: 100%;
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+.openerp .oe_list_progressbar_outer {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  border: 1px solid #aaaaaa;
+  background: #eeeeee;
+  border-radius: 3px;
+  font-size: 11px;
+}
+.openerp .oe_list_progressbar_outer progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+}
+.openerp .oe_list_progressbar_text {
+  position: relative;
+  text-align: center;
+  width: 100%;
+  height: 100%;
 }
 .openerp .tree_header {
   background-color: #f0f0f0;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-01-15 10:21:41 +0000
+++ addons/web/static/src/css/base.sass	2013-01-22 11:41:21 +0000
@@ -2347,8 +2347,33 @@
             .oe_list_handle
                 @include text-to-entypo-icon("}",#E0E0E0,18px)
                 margin-right: 7px
-        .oe_list_field_progressbar progress
-            width: 100%
+    .oe_list_progressbar_inner
+        position: absolute
+        top: 0
+        left: 0
+        border: 1px solid #aaaaaa
+        background: #aaaaaa
+        height: 100%
+        margin-top: -1px
+        margin-bottom: -1px
+    .oe_list_progressbar_outer
+        position: relative
+        width: 100%
+        height: 100%
+        border: 1px solid #aaaaaa
+        background: #eeeeee
+        border-radius: 3px
+        font-size: 11px
+    .oe_list_progressbar_outer progress
+        position: absolute
+        top: 0
+        left: 0
+        height: 100%
+    .oe_list_progressbar_text
+        position: relative
+        text-align: center
+        width: 100%
+        height: 100%
     // }}}
     // Tree view {{{
     .tree_header

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2013-01-03 14:46:51 +0000
+++ addons/web/static/src/js/view_list.js	2013-01-22 11:41:21 +0000
@@ -2236,7 +2236,7 @@
      */
     _format: function (row_data, options) {
         return _.template(
-            '<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
+            '<div class="oe_list_progressbar_outer"><div class="oe_list_progressbar_inner" style="width: <%-value%>%;"></div><div class="oe_list_progressbar_text"><span><%-value%>%</span></div></div>', {
                 value: _.str.sprintf("%.0f", row_data[this.id].value || 0)
             });
     }