From 295423af7845b14ee586a2de068e574d40fb2c71 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Tue, 11 Aug 2015 17:26:52 +0200
Subject: [PATCH] [FIX] planner: don't apply fa-* on a button tag

It doesn't make sense and it obviously applies a different font
to the text of the button.
---
 .../static/src/js/web_planner_common.js          | 16 ++++++++++------
 .../web_planner/static/src/xml/web_planner.xml   |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

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 d9fac4ad123..43afae72f20 100644
--- a/addons/web_planner/static/src/js/web_planner_common.js
+++ b/addons/web_planner/static/src/js/web_planner_common.js
@@ -115,13 +115,16 @@ var PlannerDialog = Widget.extend({
         this.set('progress', this.planner.progress); // set progress to trigger initial UI update
     },
     _render_done_page: function (page) {
-        var mark_as_done_button = this.$('.mark_as_done');
+        var mark_as_done_button = this.$('.mark_as_done')
+        var mark_as_done_li = mark_as_done_button.find('i');
         var next_button = this.$('a.btn-next');
         var active_menu = $(page.menu_item).find('span');
         if (page.done) {
             active_menu.addClass('fa-check');
-            mark_as_done_button.removeClass('fa-square-o btn-primary');
-            mark_as_done_button.addClass('fa-check-square-o btn-default');
+            mark_as_done_button.removeClass('btn-primary');
+            mark_as_done_li.removeClass('fa-square-o');
+            mark_as_done_button.addClass('btn-default');
+            mark_as_done_li.addClass('fa-check-square-o');
             next_button.removeClass('btn-default');
             next_button.addClass('btn-primary');
 
@@ -132,8 +135,10 @@ var PlannerDialog = Widget.extend({
             }, 1000);
         } else {
             active_menu.removeClass('fa-check');
-            mark_as_done_button.removeClass('fa-check-square-o btn-default');
-            mark_as_done_button.addClass('fa-square-o btn-primary');
+            mark_as_done_button.removeClass('btn-default');
+            mark_as_done_li.removeClass('fa-check-square-o');
+            mark_as_done_button.addClass('btn-primary');
+            mark_as_done_li.addClass('fa-square-o');
             next_button.removeClass('btn-primary');
             next_button.addClass('btn-default');
         }
@@ -284,7 +289,6 @@ var PlannerDialog = Widget.extend({
             mark_as_done_button.show();
         }
 
-        this.$('.o_planner_title').text(this.currently_shown_page.title);
         this._render_done_page(this.currently_shown_page);
 
         this.planner.data.last_open_page = page_id;
diff --git a/addons/web_planner/static/src/xml/web_planner.xml b/addons/web_planner/static/src/xml/web_planner.xml
index 32c043a5790..eff1715fa04 100644
--- a/addons/web_planner/static/src/xml/web_planner.xml
+++ b/addons/web_planner/static/src/xml/web_planner.xml
@@ -15,8 +15,8 @@
             </div>
 
             <div class="o_planner_header">
-                <button class='fa fa-square-o btn btn-primary mark_as_done'>
-                    <i/>
+                <button class="btn btn-primary mark_as_done">
+                    <i class="fa fa-square-o"></i>
                     <span>Mark As Done</span>
                 </button>
             </div><div class="o_planner_header text-right">