[merge]upto revno.1054.

bzr revid: vme@tinyerp.com-20110919061000-4h16q60a9zy6diy7

diff --cc addons/web/__openerp__.py
index 2c686a2,74633fa..85464e7
--- 1/addons/web/__openerp__.py
--- 2/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@@ -32,12 -32,11 +32,12 @@@
          "static/src/js/views.js",
          "static/src/js/data.js",
          "static/src/js/data_export.js",
-         "static/src/js/form.js",
-         "static/src/js/list.js",
-         "static/src/js/list-editable.js",
          "static/src/js/search.js",
+         "static/src/js/view_form.js",
+         "static/src/js/view_list.js",
+         "static/src/js/view_list_editable.js",
          "static/src/js/view_tree.js",
 +        "static/src/js/view_editor.js"
      ],
      'css' : [
          "static/lib/jquery.superfish/css/superfish.css",

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/js/core.js
Simple merge

diff --cc addons/web/static/src/js/views.js
index 5babf74,88db848..5f06297
--- 1/addons/web/static/src/js/views.js
--- 2/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@@ -754,9 -850,7 +850,8 @@@ db.web.View = db.web.Widget.extend(/** 
      },
      on_sidebar_manage_view: function() {
          if (this.fields_view && this.fields_view.arch) {
- //            $('<xmp>' + openerp.base.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
-             var view_editor = new openerp.web.ViewEditor(this, this.$element, this.dataset, this.fields_view.arch)
 -            $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
++            var view_editor = new openerp.web.ViewEditor(this, this.$element, this.dataset, this.fields_view.arch);
 +            view_editor.start();
          } else {
              this.notification.warn("Manage Views", "Could not find current view declaration");
          }

diff --cc addons/web/static/src/xml/base.xml
Simple merge