diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-04-07 15:06:44 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-04-07 15:06:44 +0200 |
| commit | 887ec82f205bbf417c3ecaa66c79f06e6c24f7d1 (patch) | |
| tree | f62823385c5181ff04a8393a3d423b57c9364d5d /addons/base/static/src | |
| parent | 3b4a87a7317545babf4c2d6d3838273f9cb478c6 (diff) | |
| parent | 51d8fdd6463fa546ba61319f1f73be8871c3e185 (diff) | |
[MERGE]
bzr revid: nicolas.vanhoren@openerp.com-20110407130644-n4u84iz4uk4ii3z2
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/base.html | 4 | ||||
| -rw-r--r-- | addons/base/static/src/js/base.js | 1 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 13 |
3 files changed, 18 insertions, 0 deletions
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index 8bb4793d42c..3bfadba0782 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -23,7 +23,11 @@ <script type="text/javascript" src="/base/static/src/js/list.js"></script> <script type="text/javascript" src="/base/static/src/js/search.js"></script> <script type="text/javascript" src="/base/static/src/js/views.js"></script> + <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js"></script> + <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js"></script> + <script type="text/javascript" src="/base_gantt/static/src/gantt.js"></script> + <link rel="stylesheet" type="text/css" media="screen" href="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css" /> <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" /> <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" /> <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css" /> diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index 4833551c24e..5975bce8023 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -122,6 +122,7 @@ openerp.base = function(instance) { openerp.base.search(instance); openerp.base.list(instance); openerp.base.form(instance); + openerp.base.gantt(instance); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 23685544094..0b3fb9b050a 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -167,6 +167,19 @@ </div> <table id="todo_use_unique_id" class="jqGrid"></table> </t> +<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"></div> + </td> + <td valign = "top"> + <div id="gantt-sidebar"></div> + </td> + </tr> + </table> +</t> <t t-name="FormView"> <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2> <div class="oe_form_header"> |