From 7c7e9970be09846586c3a86f7e15fb36e7be9dcb Mon Sep 17 00:00:00 2001 From: cpa-openerp Date: Tue, 14 Jun 2011 19:00:16 +0530 Subject: [PATCH] [FIX] Set height and width when gantt load or sidebar open-close. bzr revid: cpa@tinyerp.com-20110614133016-euwk5cmcmvgievwn --- .../static/lib/dhtmlxGantt/sources/dhtmlxgantt.js | 4 +++- addons/base_gantt/static/src/js/gantt.js | 6 ++++++ addons/base_gantt/static/src/xml/base_gantt.xml | 9 +-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js b/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js index 0d838fdd510..50459be3077 100644 --- a/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js +++ b/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js @@ -2844,7 +2844,7 @@ GanttChart.prototype.create = function(divId) var newCellTblControl; //Add to content Table - this.contentHeight = content.offsetHeight; + this.contentHeight = screen.height * 0.3; this.contentWidth = content.offsetWidth; content.appendChild(tableControl); @@ -2891,6 +2891,8 @@ GanttChart.prototype.create = function(divId) if (this._showTreePanel) { this.panelNames.style.height = (this.contentHeight - 56) + "px"; this.panelNames.style.width = this.maxWidthPanelNames + "px"; + this.panelTime.className = "ganttDayPanel"; + this.oData.className = "ganttTaskPanel"; this.oData.style.width = (this.contentWidth - this.maxWidthPanelNames) + "px"; this.panelTasks.style.width = this.dayInPixels * this.countDays + "px"; this.panelTime.style.width = (this.contentWidth - this.maxWidthPanelNames - 0*18) + "px"; diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index b6c103a4fbb..e95507f1a03 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -74,6 +74,12 @@ init: function(view_manager, session, element_id, dataset, view_id) { ganttChartControl.showContextMenu(true); ganttChartControl.showDescTask(true,'d,s-f'); ganttChartControl.showDescProject(true,'n,d'); + + jQuery(".toggle-sidebar").click(function(e) { + var $gantt_panel = jQuery(".ganttTaskPanel , .ganttDayPanel"); + $gantt_panel.width(100); + $gantt_panel.width(jQuery("#oe_app_search").width() - 150); + }); }, diff --git a/addons/base_gantt/static/src/xml/base_gantt.xml b/addons/base_gantt/static/src/xml/base_gantt.xml index c85abf0cad8..e9a95057b24 100644 --- a/addons/base_gantt/static/src/xml/base_gantt.xml +++ b/addons/base_gantt/static/src/xml/base_gantt.xml @@ -1,12 +1,5 @@