[FIX] gantt addon so it loads correctly

Also remove leftover debugging log in chrome, and fix dependencies listing for calendar

bzr revid: xmo@openerp.com-20110413142001-5dpxoava5a0cwmq7

5 files changed, 29 insertions, 10 deletions

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 77cdd264d20..4391fcf6f4e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -457,7 +457,6 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         });
     },
     do_load_css: function (result) {
-        console.log('loading CSS files');
         _.each(result.files, function (file) {
             $('head').append($('<link>', {
                 'href': file,
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 8b1d0ca6473..5688c0e05b5 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,7 +1,7 @@
 {
     "name": "Base calendar",
     "version": "2.0",
-    "depends": [],
+    "depends": ['base'],
     "js": [
         'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js',
         'static/src/js/calendar.js'
diff --git a/addons/base_gantt/__openerp__.py b/addons/base_gantt/__openerp__.py
index afd1f402b59..55cec2c0863 100644
--- a/addons/base_gantt/__openerp__.py
+++ b/addons/base_gantt/__openerp__.py
@@ -1,8 +1,12 @@
 {
     "name": "Base Gantt",
     "version": "2.0",
-    "depends": [],
-    "js": ["static/*/js/*.js"],
-    "css": [],
-    'active': False
+    "depends": ['base'],
+    "js": [
+        'static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js',
+        'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js',
+        'static/src/js/gantt.js'
+    ],
+    "css": ['static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
+    'active': True
 }
diff --git a/addons/base_gantt/static/src/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 0e65fb48b5b..f8391f2744b 100644
--- a/addons/base_gantt/static/src/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -2,9 +2,10 @@
  * OpenERP base_gantt
  *---------------------------------------------------------*/
 
-openerp.base.gantt = function (openerp) {
-openerp.base.views.add('gantt', 'openerp.base.GanttView');
-openerp.base.GanttView = openerp.base.Controller.extend({
+openerp.base_gantt = function (openerp) {
+QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
+openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
+openerp.base_gantt.GanttView = openerp.base.Controller.extend({
 
     init: function(view_manager, session, element_id, dataset, view_id) {
         this._super(session, element_id);
@@ -216,7 +217,7 @@ openerp.base.GanttView = openerp.base.Controller.extend({
                 },
                 function(result) {
                 })
-    },
+    }
 
 });
 
diff --git a/addons/base_gantt/static/src/xml/base_gantt.xml b/addons/base_gantt/static/src/xml/base_gantt.xml
new file mode 100644
index 00000000000..72c14ceb16c
--- /dev/null
+++ b/addons/base_gantt/static/src/xml/base_gantt.xml
@@ -0,0 +1,15 @@
+<template>
+  <t t-name="GanttView">
+    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+    <table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td style="width:85%">
+          <div style="width:100%;height:300px;position:relative" id="GanttDiv"/>
+        </td>
+        <td valign = "top">
+          <div id="gantt-sidebar"/>
+        </td>
+      </tr>
+    </table>
+  </t>
+</template>