diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-06-28 14:26:49 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-06-28 14:26:49 +0200 |
| commit | db4fa6582ca84cda2147ded1e98dc22659bcb198 (patch) | |
| tree | e8a4451c466b49f77cee00f7a83dcceffe63f4bb /addons/web_gantt/static/src | |
| parent | 48b08907c082164acc81cc770bc790e442a20f71 (diff) | |
| parent | 492af8bef457c63e93a952a75a9ba7bae647dc01 (diff) | |
[MERGE] Merged with trunk web.
bzr revid: tde@openerp.com-20120628105323-p50min2k8by55jg0
bzr revid: tde@openerp.com-20120628122649-affstbyq1mt80qnt
Diffstat (limited to 'addons/web_gantt/static/src')
| -rw-r--r-- | addons/web_gantt/static/src/css/gantt.css | 4 | ||||
| -rw-r--r-- | addons/web_gantt/static/src/js/gantt.js | 5 | ||||
| -rw-r--r-- | addons/web_gantt/static/src/xml/web_gantt.xml | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/addons/web_gantt/static/src/css/gantt.css b/addons/web_gantt/static/src/css/gantt.css index d9a9ed06d9e..c6939fc9463 100644 --- a/addons/web_gantt/static/src/css/gantt.css +++ b/addons/web_gantt/static/src/css/gantt.css @@ -1,9 +1,9 @@ -.openerp .oe-gantt-view-view { +.openerp .oe_gantt { min-height: 500px; } -.openerp .oe-gantt-view-view .oe-gantt-view-create { +.openerp .oe_gantt .oe_gantt_button_create { position: absolute; top: 5px; } diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 5643e0cefb3..202fb2aecc6 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -19,6 +19,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ on_loaded: function(fields_view_get, fields_get) { var self = this; this.fields_view = fields_view_get; + this.$element.addClass(this.fields_view.arch.attrs['class']); return this.rpc("/web/searchview/fields_get", {"model": this.dataset.model}).pipe(function(fields_get) { self.fields = fields_get.fields; self.has_been_loaded.resolve(); @@ -68,7 +69,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ }, on_data_loaded_2: function(tasks, group_bys) { var self = this; - $(".oe-gantt-view-view", this.$element).html(""); + $(".oe_gantt", this.$element).html(""); //prevent more that 1 group by if (group_bys.length > 0) { @@ -187,7 +188,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ var td = $($("table td", self.$element)[0]); var rendered = QWeb.render("GanttView-create-button"); $(rendered).prependTo(td); - $(".oe-gantt-view-create", this.$element).click(this.on_task_create); + $(".oe_gantt_button_create", this.$element).click(this.on_task_create); }, on_task_changed: function(task_obj) { var self = this; diff --git a/addons/web_gantt/static/src/xml/web_gantt.xml b/addons/web_gantt/static/src/xml/web_gantt.xml index 787d47a3c1e..258f545662a 100644 --- a/addons/web_gantt/static/src/xml/web_gantt.xml +++ b/addons/web_gantt/static/src/xml/web_gantt.xml @@ -3,10 +3,10 @@ <templates> <t t-name="GanttView"> <div> - <div t-att-id="widget.chart_id" class="oe-gantt-view-view"/> + <div t-att-id="widget.chart_id" class="oe_gantt"/> </div> </t> <t t-name="GanttView-create-button"> - <button class="oe_button oe-gantt-view-create">Create</button> + <button class="oe_button oe_gantt_button_create">Create</button> </t> </templates> |