[merge]merge with main lp:openerp-web branch.

bzr revid: vme@tinyerp.com-20111103111255-gcj2jfpk5d3640hg

addons/web/static/src/js/boot.js

@@ -59,7 +59,7 @@ openerp.web = function(instance) {
     openerp.web.formats(instance);
     openerp.web.chrome(instance);
     openerp.web.data(instance);
-    var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","view_editor"];
+    var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import","view_editor"];
     for(var i=0; i<files.length; i++) {
         if(openerp.web[files[i]]) {
             openerp.web[files[i]](instance);

addons/web/static/src/js/view_editor.js

@@ -10,9 +10,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.xml_element_id = 0;
     },
     start: function() {
-        this.View_editor();
+        this.init_view_editor();
     },
-    View_editor : function() {
+    init_view_editor: function() {
         var self = this;
         var action = {
             name:'ViewEditor',
@@ -26,11 +26,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             auto_search : true,
             flags: {
                 sidebar: false,
+                deletable: false,
                 views_switcher: false,
                 action_buttons:false,
                 search_view:false,
                 pager:false,
-                radio:true
+                radio: true
             },
         };
         this.view_edit_dialog = new openerp.web.Dialog(this, {

addons/web/static/src/js/views.js

@@ -583,7 +583,7 @@ session.web.Sidebar = session.web.Widget.extend({
         ]);
 
         this.add_section(_t('Other Options'), 'other');
-        this.add_items('other', [
+        this.add_items('other', [ 
             {
                 label: _t("Import"),
                 callback: this.call_default_on_sidebar
@@ -619,7 +619,7 @@ session.web.Sidebar = session.web.Widget.extend({
             }
         });
     },
-
+    
     add_section: function(name, code) {
         if(!code) code = _.underscored(name);
         var $section = this.sections[code];
@@ -693,7 +693,7 @@ session.web.Sidebar = session.web.Widget.extend({
                 }
                 return false;
             });
-
+        
             var $ul = $section.find('ul');
             if(!$ul.length) {
                 $ul = $('<ul/>').appendTo($section);
@@ -883,7 +883,7 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
             }
         };
         var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
-
+        
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {

addons/web/static/src/xml/base.xml

@@ -1380,7 +1380,6 @@
     </tr>
 </table>
 
-
 <table t-name="ExportTreeView-Secondary"
        id="field-tree-structure" class="oe_export_fields_selector_export"
        cellspacing="0" cellpadding="0">

addons/web_default_home/po/sk.po

@@ -0,0 +1,38 @@
+# Slovak translation for openerp-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-10-07 10:39+0200\n"
+"PO-Revision-Date: 2011-11-01 13:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-02 05:05+0000\n"
+"X-Generator: Launchpad (build 14214)\n"
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Welcome to your new OpenERP instance."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Remember to bookmark this page."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Remember your login:"
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Choose the first OpenERP Application you want to install.."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Install"
+msgstr ""

addons/web_graph/controllers/__init__.py

@@ -1 +0,0 @@
-import main

addons/web_graph/controllers/main.py

@@ -1,11 +0,0 @@
-from web.controllers.main import View
-import web.common as openerpweb
-
-class GraphView(View):
-    _cp_path = "/web_graph/graphview"
-
-    @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req, model, view_id, 'graph')
-        all_fields = req.session.model(model).fields_get()
-        return {'fields_view': fields_view, 'all_fields':all_fields}