diff options
| author | Valerie Pirenne <vpi@odoo.com> | 2015-07-08 10:53:50 +0200 |
|---|---|---|
| committer | David Monjoie <dmo@odoo.com> | 2015-07-08 10:58:38 +0200 |
| commit | d1e4e0d58dba0130816cb078c94513e12c85d5ce (patch) | |
| tree | 9329bf093f2ff72a8c8d8a9d14e179b14afecbb9 /addons/web_planner/static/src | |
| parent | ebe0ff67816ba9db6b9f243bc8c613a768bf5772 (diff) | |
[IMP] web_planner: hide progressbar when full
Diffstat (limited to 'addons/web_planner/static/src')
| -rw-r--r-- | addons/web_planner/static/src/js/web_planner_backend.js | 7 | ||||
| -rw-r--r-- | addons/web_planner/static/src/less/web_planner_common.less | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/addons/web_planner/static/src/js/web_planner_backend.js b/addons/web_planner/static/src/js/web_planner_backend.js index ed6095d71c6..b66abf2b414 100644 --- a/addons/web_planner/static/src/js/web_planner_backend.js +++ b/addons/web_planner/static/src/js/web_planner_backend.js @@ -49,7 +49,6 @@ var PlannerLauncher = Widget.extend({ on_menu_clicked: function(id, $clicked_menu) { var menu_id = $clicked_menu.parents('.oe_secondary_menu').data('menu-parent') || 0; // find top menu id if (_.contains(_.keys(this.planner_apps), menu_id.toString())) { - this.$el.show(); this.setup(this.planner_apps[menu_id]); this.need_reflow = true; } else { @@ -76,6 +75,12 @@ var PlannerLauncher = Widget.extend({ }, // event update_parent_progress_bar: function(percent) { + if (percent == 100) { + this.$(".progress").hide(); + } else { + this.$(".progress").show(); + } + this.$el.show(); this.$(".progress-bar").css('width', percent+"%"); }, toggle_dialog: function() { diff --git a/addons/web_planner/static/src/less/web_planner_common.less b/addons/web_planner/static/src/less/web_planner_common.less index 1a1ba6e0886..90a7521d457 100644 --- a/addons/web_planner/static/src/less/web_planner_common.less +++ b/addons/web_planner/static/src/less/web_planner_common.less @@ -177,11 +177,14 @@ /**************** MENU PROGRESS BAR ****************/ #oe_main_menu_navbar.navbar { .o_planner_systray { - width: 100px; height: 13px; margin: 10px 0 0 0; div.o_planner_progress { cursor: pointer; + .progress { + display: inline-block; + width: 85px; + } } .o_planner_progress { div.progress { |