[REF] planner: back again in a modal

fp's request

2 files changed, 15 insertions, 10 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 c6126cf5db3..4bf467364ad 100644
--- a/addons/web_planner/static/src/js/web_planner_backend.js
+++ b/addons/web_planner/static/src/js/web_planner_backend.js
@@ -52,19 +52,23 @@ var PlannerLauncher = Widget.extend({
             this.need_reflow = true;
         } else {
             this.do_hide();
-            this.hide_dialog();
             this.need_reflow = true;
         }
         if (this.need_reflow) {
             core.bus.trigger('resize');
             this.need_reflow = false;
         }
+
+        if (this.dialog) {
+            this.dialog.$el.modal('hide');
+        }
     },
     setup: function(planner){
         var self = this;
 
         this.planner = planner;
         if (this.dialog) {
+            this.dialog.$el.modal('hide');
             this.dialog.destroy();
         }
         this.dialog = new PlannerDialog(this, planner);
@@ -84,13 +88,8 @@ var PlannerLauncher = Widget.extend({
         this.do_show();
         this.$(".progress-bar").css('width', percent+"%");
     },
-    hide_dialog: function() {
-        if (this.dialog) {
-            this.dialog.do_hide();
-        }
-    },
     toggle_dialog: function() {
-        this.dialog.do_toggle();
+        this.dialog.$el.modal('toggle');
     }
 });
 
diff --git a/addons/web_planner/static/src/js/web_planner_common.js b/addons/web_planner/static/src/js/web_planner_common.js
index aae7debcada..5994f07262d 100644
--- a/addons/web_planner/static/src/js/web_planner_common.js
+++ b/addons/web_planner/static/src/js/web_planner_common.js
@@ -46,6 +46,7 @@ var PlannerDialog = Widget.extend({
         'click li a[href^="#"]:not([data-toggle="collapse"])': 'change_page',
         'click button.mark_as_done': 'click_on_done',
         'click a.btn-next': 'change_to_next_page',
+        'click .o_planner_close_block span': 'close_modal',
     },
     init: function(parent, planner) {
         this._super(parent);
@@ -70,8 +71,6 @@ var PlannerDialog = Widget.extend({
     start: function() {
         var self = this;
         return this._super.apply(this, arguments).then(function() {
-            self.do_hide();
-
             self.$el.on('keyup', "textarea", function() {
                 if (this.scrollHeight != this.clientHeight) {
                     this.style.height = this.scrollHeight + "px";
@@ -157,6 +156,7 @@ var PlannerDialog = Widget.extend({
     },
     update_ui_progress_bar: function(percent) {
         this.$(".progress-bar").css('width', percent+"%");
+        this.$(".o_progress_text").text(percent+"%");
     },
     _create_menu_item: function(page, menu_items, menu_item_page_map) {
         var $page = $(page.dom);
@@ -292,8 +292,10 @@ var PlannerDialog = Widget.extend({
 
         this.planner.data.last_open_page = page_id;
         utils.set_cookie(this.cookie_name, page_id, 8*60*60); // create cookie for 8h
-        this.$(".o_planner_page").scrollTop("0");
+        this.$(".modal-body").scrollTop("0");
         autosize(this.$("textarea"));
+
+        this.$('.o_currently_shown_page').text(this.currently_shown_page.title);
     },
     // planner data functions
     _get_values: function(page){
@@ -391,6 +393,10 @@ var PlannerDialog = Widget.extend({
         this._render_done_page(this.currently_shown_page);
         this.update_planner();
     },
+    close_modal: function(ev) {
+        ev.preventDefault();
+        this.$el.modal('hide');
+    }
 });
 
 return {