From 0e6ae57f118065d0d8299af5e4ba09085b91b737 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 21 Jul 2011 17:55:34 +0530 Subject: [PATCH] [FIX]Dynamic Header. bzr revid: bth@tinyerp.com-20110721122534-fbxaebln1cd7tv5p --- addons/base/static/src/css/base.css | 18 +++++++ addons/base/static/src/js/tree.js | 20 +++---- addons/base/static/src/xml/base.xml | 81 +++++++++++++++++++---------- 3 files changed, 82 insertions(+), 37 deletions(-) diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 4a3cfcb5884..3fba213fb4a 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1076,3 +1076,21 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ font-size: 1.2em; font-weight: bold; } +.mouse-over { + color: #0000FF; +} +.treeview-tr { + cursor: pointer; + text-align: left; + vertical-align: top; +} +.treeview-td { + text-align: right; + vertical-align: top; +} +.treeview-header { + text-align: left; + padding-left: 15px; + font-weight: bold; + vertical-align: top; +} \ No newline at end of file diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js index 5156fc4a04c..0c7b971d9ef 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/tree.js @@ -41,14 +41,15 @@ openerp.base.TreeView = openerp.base.View.extend({ }, on_loaded: function (data) { + var self = this; this.fields_view = data.field_parent; this.fields = data.fields; + self.dataset.domain = [['parent_id', '=', '']]; this.dataset.read_slice([], 0, false, function (response) { + self.$element.html(QWeb.render('TreeView', { 'field_data': response, 'title': self.fields_view.arch.attrs.string })); - self.$element.html(QWeb.render('TreeView', { 'field_data' : response, 'title' : self.fields_view.arch.attrs.string })); - self.$element.append(QWeb.render('TreeView_Header')); self.$element.find('#parent_id').bind('change', function(){ self.getdata($('#parent_id').val(), false); }); @@ -58,6 +59,7 @@ openerp.base.TreeView = openerp.base.View.extend({ // get child data of selected value getdata: function (id, flag) { + var self = this; self.dataset.domain = [['parent_id', '=', parseInt(id, 10)]]; @@ -68,7 +70,7 @@ openerp.base.TreeView = openerp.base.View.extend({ if (curr_node.length == 1) { curr_node.find('td').children(':first-child').attr('src','/base/static/src/img/collapse.gif'); - curr_node.after(QWeb.render('TreeView_Secondry', {'child_data' : response})); + curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0' })); for (var i = 0; i < response.length; i++) { row_id = $('tr #treerow_' + response[i].id); @@ -105,11 +107,9 @@ openerp.base.TreeView = openerp.base.View.extend({ } } else { if (!flag) { - self.$element.find('tr').remove(); - self.$element.append(QWeb.render('TreeView_Header')); + self.$element.find('table').remove(); } - - self.$element.append(QWeb.render('TreeView_Secondry', {'child_data' : response})); + self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children })); self.$element.find('tr[id ^= treerow_]').each( function() { $(this).find('td').children(':first-child').addClass("parent_top"); if (!($(this).find('td').children(':first-child').attr('id'))) { @@ -118,10 +118,10 @@ openerp.base.TreeView = openerp.base.View.extend({ }); } - self.$element.find('tr').find('td:first').mouseover( function() { - $(this).css('color', '#0000FF'); + self.$element.find('tbody tr').find('td:first').mouseover( function() { + $(this).addClass('mouse-over'); }).mouseout( function() { - $(this).css('color','#000000'); + $(this).removeClass('mouse-over'); }); self.$element.find('tr[id ^= treerow_] td').children(':first-child').click( function() { diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 93ff3cb70a9..a9a1c4f505e 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -246,34 +246,61 @@ - - - Name - - Category Type - - Sequence - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + +