[MERGE] trunk

bzr revid: fme@openerp.com-20121105093013-31veb91zkdeiuddh

2 files changed, 5 insertions, 12 deletions

diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css
index e80e15a4c17..e48bf344629 100644
--- a/addons/web_view_editor/static/src/css/view_editor.css
+++ b/addons/web_view_editor/static/src/css/view_editor.css
@@ -1,20 +1,14 @@
 .openerp .oe_view_editor {
   width: 100%;
-  border-collapse: collapse;
   margin-left: -12px;
-  width: 100%;
-  background-color: white;
-  border-spacing: 0;
 }
 .openerp .oe_view_editor td {
-  text-align: center;
-  white-space: nowrap;
   border: 1px solid #d8d8d8;
   cursor: pointer;
-  font-size: 90%;
 }
-.openerp .oe_view_editor_field td {
+.openerp .oe_view_editor td *{
   border: 0px !important;
+  color : #404040;
 }
 .openerp .oe_view_editor tr:hover {
   background-color: #ecebf2;
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 78c8fff90fa..a844c0f3be8 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -18,11 +18,10 @@ instance.web.ViewManagerAction.include({
             return this._super.apply(this,arguments); 
         }
     }
-})
+});
 instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
-        this.element_id = element_id;
         this.parent = parent;
         this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
@@ -74,12 +73,12 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         $.when(this.action_manager.do_action(action)).done(function() {
             var viewmanager = self.action_manager.inner_widget;
             var controller = viewmanager.views[viewmanager.active_view].controller;
-            controller.on('view_loaded', function(){
+            controller.on('view_loaded', self, function(){
                 $(controller.groups).bind({
                     'selected': function(e, ids, records) {
                         self.main_view_id = ids[0];
                     }
-                })
+                });
             });
         });
     },