[FIX] Minor Changes

bzr revid: bth@tinyerp.com-20110614090216-2eaqjl31dzxioriu

3 files changed, 37 insertions, 33 deletions

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index fff41c0f557..126b3ba6bac 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -167,7 +167,7 @@ background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */
     height: 20px;
     margin: 3px 2px;
     padding: 0 8px;
-    
+
 background: #bd5e54; /* Old browsers */
 background: -moz-linear-gradient(top, #bd5e54 0%, #90322a 60%); /* FF3.6+ */
 background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bd5e54), color-stop(60%,#90322a)); /* Chrome,Safari4+ */
@@ -176,12 +176,12 @@ background: -o-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* Opera11.10+ */
 background: -ms-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* IE10+ */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#BD5E54', endColorstr='#90322A',GradientType=0 ); /* IE6-9 */
 background: linear-gradient(top, #bd5e54 0%,#90322a 60%); /* W3C */
-    
+
     border: 1px solid #6E2A24;
     border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
-    
+
     color: #eee;
     text-shadow: #222 0 1px 0;
     text-decoration: none;
@@ -203,7 +203,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C6C6C6', end
 background: linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* W3C */
 /* for ie */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5c5c5c', endColorstr='#969595',GradientType=0 ); /* IE6-9 */
-    
+
     color: #fff;
 }
 /* Secondary Menu */
@@ -906,7 +906,7 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     padding-left: 10px;
     padding-right: 21px;
     height: 21px;
-    
+
 background: #ffffff; /* Old browsers */
 background: -moz-linear-gradient(top, #ffffff 0%, #ebe9e9 100%); /* FF3.6+ */
 background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ebe9e9)); /* Chrome,Safari4+ */
@@ -915,7 +915,7 @@ background: -o-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Opera11.10+ */
 background: -ms-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* IE10+ */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EBE9E9',GradientType=0 ); /* IE6-9 */
 background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
-    
+
     border: 1px solid #D2CFCF;
     border-right-width: 0;
     border-left-width: 0;
@@ -1055,5 +1055,8 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
 .openerp div.m2o_contextmenu span.disabled {
     color: #C0C0C0;
 }
+.top{
+    vertical-align: text-top;
+}
 
 /*----- End Many2one Contextmenu ------- */
diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js
index c243ebfaefb..647bf05de68 100644
--- a/addons/base/static/src/js/tree.js
+++ b/addons/base/static/src/js/tree.js
@@ -44,31 +44,32 @@ openerp.base.TreeView = openerp.base.View.extend({
         var self = this;
         self.dataset.domain = [['parent_id', '=', parseInt(id, 10)]];
         self.dataset.read_slice([], 0, false, function (response) {
-            if (($('tr #Treerow_' + id).length) == 1) {
-                $('tr #Treerow_' + id).find('td #parentimg').attr('src','/base/static/src/img/collapse.gif');
-                $('tr #Treerow_' + id).after(QWeb.render('TreeView_Secondry', {'child_data' : response}));
-                parentlen = $('tr #Treerow_' + id).find('td').length;
+            if (($('tr #treerow_' + id).length) == 1) {
+                $('tr #treerow_' + id).find('td #parentimg').attr('src','/base/static/src/img/collapse.gif');
+                $('tr #treerow_' + id).after(QWeb.render('TreeView_Secondry', {'child_data' : response}));
+                parentlen = $('tr #treerow_' + id).find('td').length;
                 for (i in response) {
-                    if ($('tr #Treerow_' + response[i].id)) {
-                        childlen = $('tr #Treerow_' + response[i].id).find('td').length;
+                    if ($('tr #treerow_' + response[i].id)) {
+                        childlen = $('tr #treerow_' + response[i].id).find('td').length;
                         while (childlen < (parentlen + 1)) {
-                            $('tr #Treerow_' + response[i].id).find('td:eq(0)').before('<td></td>');
+                            $('tr #treerow_' + response[i].id).find('td:eq(0)').before('<td></td>');
                             childlen++;
                         }
                     }
                 }
                 for (i in response) {
-                    if ($('tr #Treerow_' + response[i].id)) {
-                        childlen = $('tr #Treerow_' + response[i].id).find('td').length;
-                        textoftd = $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 1) +')').text();
-                        if ($('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').length > 0) {
-                            $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '2px' });
+                    if ($('tr #treerow_' + response[i].id)) {
+                        childlen = $('tr #treerow_' + response[i].id).find('td').length;
+                        textoftd = $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 1) +')').text();
+                        if ($('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').length > 0) {
+                            $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '2px' });
+                            $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').addClass("top");
                         } else {
-                            $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '35px' });
+                            $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '35px' });
                         }
-                        $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').attr('colspan', '2');
-                        $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').append(textoftd);
-                        $('tr #Treerow_' + response[i].id).find('td:eq('+ (childlen - 1) +')').remove();
+                        $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').attr('colspan', '2');
+                        $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').append(textoftd);
+                        $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 1) +')').remove();
                     }
                 }
             } else {
@@ -94,8 +95,8 @@ openerp.base.TreeView = openerp.base.View.extend({
                         if (rowid[1] == response[i].id){
                             if (response[i].child_id.length > 0) {
                                 jQuery(response[i].child_id).each (function(e, chid) {
-                                    if (jQuery('tr #Treerow_' + chid).length > 0) {
-                                        if (jQuery('tr #Treerow_' + chid).is(':hidden')) {
+                                    if (jQuery('tr #treerow_' + chid).length > 0) {
+                                        if (jQuery('tr #treerow_' + chid).is(':hidden')) {
                                             divflag = -1;
                                         } else {
                                             divflag++;
@@ -123,30 +124,30 @@ openerp.base.TreeView = openerp.base.View.extend({
     showcontent: function (id, flag, childid) {
         var self=this;
         if (flag == 1) {
-            $('tr #Treerow_' + id).find('td #parentimg').attr('src', '/base/static/src/img/expand.gif');
+            $('tr #treerow_' + id).find('td #parentimg').attr('src', '/base/static/src/img/expand.gif');
         }
         else {
-            $('tr #Treerow_' + id).find('td #parentimg').attr('src', '/base/static/src/img/collapse.gif');
+            $('tr #treerow_' + id).find('td #parentimg').attr('src', '/base/static/src/img/collapse.gif');
         }
 
         for (i in childid) {
             if (flag == 1) {
                 self.dataset.domain = [['parent_id', '=', parseInt(childid[i], 10)]];
-                childimg = $('tr #Treerow_ '+ childid[i]).find('td #parentimg').attr('src');
+                childimg = $('tr #treerow_ '+ childid[i]).find('td #parentimg').attr('src');
                 if (childimg == "/base/static/src/img/collapse.gif") {
-                    $('tr #Treerow_'+childid[i]).find('td #parentimg').attr('src','/base/static/src/img/expand.gif');
+                    $('tr #treerow_'+childid[i]).find('td #parentimg').attr('src','/base/static/src/img/expand.gif');
                 }
                 self.dataset.read_slice([], 0, false, function (response) {
                     for (j in response) {
-                        if (jQuery('tr #Treerow_' + response[j].id).length > 0) {
-                            jQuery('tr #Treerow_' + response[j].id).hide();
+                        if (jQuery('tr #treerow_' + response[j].id).length > 0) {
+                            jQuery('tr #treerow_' + response[j].id).hide();
                         }
                     }
                 });
-                jQuery ('tr #Treerow_' + childid[i]).hide();
+                jQuery ('tr #treerow_' + childid[i]).hide();
             }
             else {
-                jQuery ('tr #Treerow_' + childid[i]).show();
+                jQuery ('tr #treerow_' + childid[i]).show();
             }
         }
     },
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 8153401958b..16973187604 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -239,7 +239,7 @@
 </t>
 <t t-name="TreeView_Secondry">
     <t t-foreach="child_data" t-as="field" >
-        <tr t-att-id="'Treerow_'+field.id" class="childclass">
+        <tr t-att-id="'treerow_'+field.id">
             <td valign="top" align="left" style="cursor:pointer;">
                 <t t-if="(field.child_id).length>=1">
                     <img id="parentimg" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>