rename base into web part1

bzr revid: al@openerp.com-20110905110309-egx167t1ni1fzho1

addons/base/po/base.pot

@@ -1,482 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-08-17 13:28+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/base/static/src/js/form.js:1459
-msgid "<em>   Search More...</em>"
-msgstr ""
-
-#: addons/base/static/src/js/form.js:1472
-#, python-format
-msgid "<em>   Create \"<strong>%s</strong>\"</em>"
-msgstr ""
-
-#: addons/base/static/src/js/form.js:1478
-msgid "<em>   Create and Edit...</em>"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "x"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "#{title}"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "#{text}"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Powered by"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "openerp.com"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Loading..."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Create"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Drop"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Backup"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Restore"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Password"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Back to Login"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "CREATE DATABASE"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Master password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "New database name:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Load Demonstration data:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Default language:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Admin password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Confirm password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "DROP DATABASE"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Database:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Master Password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "BACKUP DATABASE"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "RESTORE DATABASE"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "File:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "CHANGE MASTER PASSWORD"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "New master password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Confirm new master password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "User:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Password:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Database"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Login"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Bad username or password"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ""
-"We think that daily job activities can be more intuitive, efficient, "
-"automated, .. and even fun."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "OpenERP's vision to be:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Full featured"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ""
-"Today's enterprise challenges are multiple. We provide one module for "
-"each need."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Open Source"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ""
-"To Build a great product, we rely on the knowledge of thousands of "
-"contributors."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "User Friendly"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "In order to be productive, people need clean and easy to use interface."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "-"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "rpc_session_id:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "1"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "LOGOUT"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "h3"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "<"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ">"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "</"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "h4"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Delete"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "First"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Last"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "♻"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "xml"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save & Edit"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Create & Edit"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "New"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "<<"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "0"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "/"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ">>"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Add"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Unhandled widget"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "?"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ":"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Open..."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Create..."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Search..."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "One2Many widget"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Uploading ..."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Select"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save As"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Clear"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Advanced Filter"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "-- Filters --"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "-- Actions --"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save Filter"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Manage Filters"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Filter Name:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "(Any existing filter with the same name will be replaced)"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "?"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Any of the following conditions must match"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "All the following conditions must match"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "None of the following conditions must match"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Add condition"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "and"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Cancel"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save & New"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save & Close"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Export"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid ""
-"This wizard will export all data that matches the current search criteria"
-" to a CSV file.\n"
-"                You can export all data or only the fields that can be "
-"reimported after modification."
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Export Type:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Import Compatible Export"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Export all Data"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Export Format"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "CSV"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Excel"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Available fields"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Fields to export"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save fields list"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Remove"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Remove All"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Name"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "&nbsp;"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Save as:"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Ok"
-msgstr ""
-
-#: addons/base/static/src/xml/base.xml:0
-msgid "Saved exports:"
-msgstr ""
-

addons/base/static/test/formats.js

@@ -1,54 +0,0 @@
-$(document).ready(function () {
-    var openerp;
-    module('base-formats', {
-        setup: function () {
-            openerp = window.openerp.init();
-            window.openerp.base.core(openerp);
-            window.openerp.base.dates(openerp);
-            window.openerp.base.formats(openerp);
-        }
-    });
-    test("format_datetime", function () {
-        var date = openerp.base.str_to_datetime("2009-05-04 12:34:23");
-        var str = openerp.base.format_value(date, {type:"datetime"});
-        equal(str, date.toString("M/d/yyyy h:mm:ss tt"));
-    });
-    test("format_date", function () {
-        var date = openerp.base.str_to_datetime("2009-05-04 12:34:23");
-        var str = openerp.base.format_value(date, {type:"date"});
-        equal(str, date.toString("M/d/yyyy"));
-    });
-    test("format_time", function () {
-        var date = openerp.base.str_to_datetime("2009-05-04 12:34:23");
-        var str = openerp.base.format_value(date, {type:"time"});
-        equal(str, date.toString("h:mm:ss tt"));
-    });
-    test("format_float", function () {
-        var fl = 12.1234;
-        var str = openerp.base.format_value(fl, {type:"float"});
-        equal(str, "12.12");
-    });
-    test("parse_datetime", function () {
-        var val = openerp.base.str_to_datetime("2009-05-04 12:34:23");
-        var res = openerp.base.parse_value(val.toString("M/d/yyyy h:mm:ss tt"), {type:"datetime"});
-        equal(val.toString("M/d/yyyy h:mm:ss tt"), res.toString("M/d/yyyy h:mm:ss tt"));
-    });
-    test("parse_date", function () {
-        var val = openerp.base.str_to_date("2009-05-04");
-        var res = openerp.base.parse_value(val.toString("M/d/yyyy"), {type:"date"});
-        equal(val.toString("M/d/yyyy"), res.toString("M/d/yyyy"));
-    });
-    test("parse_time", function () {
-        var val = openerp.base.str_to_time("12:34:23");
-        var res = openerp.base.parse_value(val.toString("h:mm:ss tt"), {type:"time"});
-        equal(val.toString("h:mm:ss tt"), res.toString("h:mm:ss tt"));
-    });
-    test("parse_float", function () {
-        var str = "134,112.1234";
-        var val = openerp.base.parse_value(str, {type:"float"});
-        equal(val, 134112.1234);
-        var str = "-134,112.1234";
-        var val = openerp.base.parse_value(str, {type:"float"});
-        equal(val, -134112.1234);
-    });
-});

addons/base/static/test/registry.js

@@ -1,33 +0,0 @@
-$(document).ready(function () {
-    var openerp;
-    module('Registry', {
-        setup: function () {
-            openerp = window.openerp.init(true);
-            window.openerp.base.core(openerp);
-            openerp.base.Foo = {};
-            openerp.base.Bar = {};
-        }
-    });
-    test('key fetch', function () {
-        var reg = new openerp.base.Registry({
-            foo: 'openerp.base.Foo',
-            bar: 'openerp.base.Bar',
-            quux: 'openerp.base.Quux'
-        });
-
-        strictEqual(reg.get_object('foo'), openerp.base.Foo);
-        raises(function () { reg.get_object('qux'); },
-               openerp.base.KeyNotFound,
-               "Unknown keys should raise KeyNotFound");
-        raises(function () { reg.get_object('quux'); },
-               openerp.base.ObjectNotFound,
-               "Incorrect file paths should raise ObjectNotFound");
-    });
-    test('key set', function () {
-        var reg = new openerp.base.Registry();
-
-        reg.add('foo', 'openerp.base.Foo')
-           .add('bar', 'openerp.base.Bar');
-        strictEqual(reg.get_object('bar'), openerp.base.Bar);
-    });
-});

addons/base/static/test/test.html

@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html style="height: 100%">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>OpenERP</title>
-    <link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
-
-    <link rel="stylesheet" href="/base/static/lib/qunit/qunit-2011-23-22.css">
-    <script src="/base/static/lib/qunit/qunit-2011-23-22.js" type="text/javascript"></script>
-
-    <script src="/base/static/lib/underscore/underscore.js" type="text/javascript"></script>
-    <script src="/base/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
-
-    <!-- jquery -->
-    <script src="/base/static/lib/jquery/jquery-1.6.2.js"></script>
-    <script src="/base/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
-    
-    <script src="/base/static/lib/datejs/globalization/en-US.js"></script>
-    <script src="/base/static/lib/datejs/core.js"></script>
-    <script src="/base/static/lib/datejs/parser.js"></script>
-    <script src="/base/static/lib/datejs/sugarpak.js"></script>
-    <script src="/base/static/lib/datejs/extras.js"></script>
-
-    <script src="/base/static/lib/qweb/qweb.js"></script>
-
-    <script src="/base/static/src/js/boot.js"></script>
-    <script src="/base/static/src/js/core.js"></script>
-    <script src="/base/static/src/js/dates.js"></script>
-    <script src="/base/static/src/js/formats.js"></script>
-    <script src="/base/static/src/js/chrome.js"></script>
-    <script src="/base/static/src/js/data.js"></script>
-    <script src="/base/static/src/js/views.js"></script>
-    <script src="/base/static/src/js/search.js"></script>
-    <script src="/base/static/src/js/form.js"></script>
-    <script src="/base/static/src/js/list.js"></script>
-    <script type="text/javascript">
-        QWeb.add_template('/base/static/src/xml/base.xml');
-    </script>
-</head>
-    <body id="oe" class="openerp">
-        <h1 id="qunit-header">OpenERP Base Test Suite</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture"></div>
-    </body>
-    <script type="text/javascript" src="/base/static/test/class.js"></script>
-    <script type="text/javascript" src="/base/static/test/registry.js"></script>
-    <script type="text/javascript" src="/base/static/test/form.js"></script>
-    <script type="text/javascript" src="/base/static/test/list-utils.js"></script>
-    <script type="text/javascript" src="/base/static/test/formats.js"></script>
-</html>

addons/web/__openerp__.py

@@ -1,5 +1,5 @@
 {
-    "name" : "OpenERP Web base",
+    "name" : "OpenERP Web web",
     "version" : "2.0",
     "depends" : [],
     'active': True,
@@ -43,7 +43,7 @@
         "static/lib/jquery.superfish/css/superfish.css",
         "static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css",
         "static/lib/jquery.ui.notify/css/ui.notify.css",
-        "static/src/css/base.css",
+        "static/src/css/web.css",
         "static/src/css/data_export.css",
     ],
 }

addons/web/common/dispatch.py

@@ -314,7 +314,7 @@ class Root(object):
                       by the server, will be filtered by this pattern
     """
     def __init__(self, options):
-        self.root = werkzeug.urls.Href('/base/webclient/home')
+        self.root = werkzeug.urls.Href('/web/webclient/home')
         self.config = options
 
         self.session_cookie = 'sessionid'

addons/web/controllers/main.py

@@ -13,11 +13,11 @@ import time
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
-import base.common.dispatch as openerpweb
+import web.common.dispatch as openerpweb
-import base.common.ast
+import web.common.ast
-import base.common.nonliterals
+import web.common.nonliterals
-openerpweb.ast = base.common.ast
+openerpweb.ast = web.common.ast
-openerpweb.nonliterals = base.common.nonliterals
+openerpweb.nonliterals = web.common.nonliterals
 
 from babel.messages.pofile import read_po
 
@@ -63,7 +63,7 @@ class Xml2Json:
         return res
 
 #----------------------------------------------------------
-# OpenERP Web base Controllers
+# OpenERP Web web Controllers
 #----------------------------------------------------------
 
 def manifest_glob(addons_path, addons, key):
@@ -97,17 +97,17 @@ home_template = textwrap.dedent("""<!DOCTYPE html>
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <title>OpenERP</title>
-        <link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
+        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
         %(css)s
         <!--[if lte IE 7]>
-        <link rel="stylesheet" href="/base/static/src/css/base-ie7.css" type="text/css"/>
+        <link rel="stylesheet" href="/web/static/src/css/web-ie7.css" type="text/css"/>
         <![endif]-->
         %(javascript)s
         <script type="text/javascript">
             $(function() {
                 QWeb = new QWeb2.Engine();
                 var c = new openerp.init();
-                var wc = new c.base.WebClient("oe");
+                var wc = new c.web.WebClient("oe");
                 wc.start();
             });
         </script>
@@ -116,25 +116,25 @@ home_template = textwrap.dedent("""<!DOCTYPE html>
 </html>
 """)
 class WebClient(openerpweb.Controller):
-    _cp_path = "/base/webclient"
+    _cp_path = "/web/webclient"
 
     @openerpweb.jsonrequest
-    def csslist(self, req, mods='base'):
+    def csslist(self, req, mods='web'):
         return manifest_glob(req.config.addons_path, mods.split(','), 'css')
 
     @openerpweb.jsonrequest
-    def jslist(self, req, mods='base'):
+    def jslist(self, req, mods='web'):
         return manifest_glob(req.config.addons_path, mods.split(','), 'js')
 
     @openerpweb.httprequest
-    def css(self, req, mods='base'):
+    def css(self, req, mods='web'):
         files = manifest_glob(req.config.addons_path, mods.split(','), 'css')
         content,timestamp = concat_files(req.config.addons_path, files)
         # TODO request set the Date of last modif and Etag
         return req.make_response(content, [('Content-Type', 'text/css')])
 
     @openerpweb.httprequest
-    def js(self, req, mods='base'):
+    def js(self, req, mods='web'):
         files = manifest_glob(req.config.addons_path, mods.split(','), 'js')
         content,timestamp = concat_files(req.config.addons_path, files)
         # TODO request set the Date of last modif and Etag
@@ -143,15 +143,15 @@ class WebClient(openerpweb.Controller):
     @openerpweb.httprequest
     def home(self, req, s_action=None, **kw):
         # script tags
-        jslist = ['/base/webclient/js']
+        jslist = ['/web/webclient/js']
         if req.debug:
-            jslist = manifest_glob(req.config.addons_path, ['base'], 'js')
+            jslist = manifest_glob(req.config.addons_path, ['web'], 'js')
         js = "\n        ".join(['<script type="text/javascript" src="%s"></script>'%i for i in jslist])
 
         # css tags
-        csslist = ['/base/webclient/css']
+        csslist = ['/web/webclient/css']
         if req.debug:
-            csslist = manifest_glob(req.config.addons_path, ['base'], 'css')
+            csslist = manifest_glob(req.config.addons_path, ['web'], 'css')
         css = "\n        ".join(['<link rel="stylesheet" href="%s">'%i for i in csslist])
         r = home_template % {
             'javascript': js,
@@ -196,7 +196,7 @@ class WebClient(openerpweb.Controller):
                 "lang_parameters": lang_obj}
 
 class Database(openerpweb.Controller):
-    _cp_path = "/base/database"
+    _cp_path = "/web/database"
 
     @openerpweb.jsonrequest
     def get_list(self, req):
@@ -282,7 +282,7 @@ class Database(openerpweb.Controller):
         return {'error': 'Error, password not changed !', 'title': 'Change Password'}
 
 class Session(openerpweb.Controller):
-    _cp_path = "/base/session"
+    _cp_path = "/web/session"
 
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
@@ -329,7 +329,7 @@ class Session(openerpweb.Controller):
         # TODO query server for installed web modules
         mods = []
         for name, manifest in openerpweb.addons_manifest.items():
-            if name != 'base' and manifest.get('active', True):
+            if name != 'web' and manifest.get('active', True):
                 mods.append(name)
         return mods
 
@@ -533,7 +533,7 @@ def fix_view_modes(action):
     return action
 
 class Menu(openerpweb.Controller):
-    _cp_path = "/base/menu"
+    _cp_path = "/web/menu"
 
     @openerpweb.jsonrequest
     def load(self, req):
@@ -581,7 +581,7 @@ class Menu(openerpweb.Controller):
         return {"action": actions}
 
 class DataSet(openerpweb.Controller):
-    _cp_path = "/base/dataset"
+    _cp_path = "/web/dataset"
 
     @openerpweb.jsonrequest
     def fields(self, req, model):
@@ -733,7 +733,7 @@ class DataSet(openerpweb.Controller):
         return {'result': r}
 
 class DataGroup(openerpweb.Controller):
-    _cp_path = "/base/group"
+    _cp_path = "/web/group"
     @openerpweb.jsonrequest
     def read(self, req, model, fields, group_by_fields, domain=None, sort=None):
         Model = req.session.model(model)
@@ -744,7 +744,7 @@ class DataGroup(openerpweb.Controller):
             dict(context, group_by=group_by_fields), sort or False)
 
 class View(openerpweb.Controller):
-    _cp_path = "/base/view"
+    _cp_path = "/web/view"
 
     def fields_view_get(self, req, model, view_id, view_type,
                         transform=True, toolbar=False, submenu=False):
@@ -874,7 +874,7 @@ class View(openerpweb.Controller):
                 elem.set(el, self.parse_context(context_string, session))
 
 class FormView(View):
-    _cp_path = "/base/formview"
+    _cp_path = "/web/formview"
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
@@ -882,7 +882,7 @@ class FormView(View):
         return {'fields_view': fields_view}
 
 class ListView(View):
-    _cp_path = "/base/listview"
+    _cp_path = "/web/listview"
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
@@ -908,7 +908,7 @@ class ListView(View):
         return 'maroon'
 
 class SearchView(View):
-    _cp_path = "/base/searchview"
+    _cp_path = "/web/searchview"
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id):
@@ -956,7 +956,7 @@ class SearchView(View):
         return to_return
 
 class Binary(openerpweb.Controller):
-    _cp_path = "/base/binary"
+    _cp_path = "/web/binary"
 
     @openerpweb.httprequest
     def image(self, req, model, id, field, **kw):
@@ -972,7 +972,7 @@ class Binary(openerpweb.Controller):
         except: # TODO: what's the exception here?
             return self.placeholder(req)
     def placeholder(self, req):
-        return open(os.path.join(req.addons_path, 'base', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
+        return open(os.path.join(req.addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
 
     @openerpweb.httprequest
     def saveas(self, req, model, id, field, fieldname, **kw):
@@ -1030,7 +1030,7 @@ class Binary(openerpweb.Controller):
                     </script>"""
             attachment_id = Model.create({
                 'name': ufile.filename,
-                'datas': base64.encodestring(ufile.file.read()),
+                'datas': web64.encodestring(ufile.file.read()),
                 'res_model': model,
                 'res_id': int(id)
             }, context)
@@ -1043,7 +1043,7 @@ class Binary(openerpweb.Controller):
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
 class Action(openerpweb.Controller):
-    _cp_path = "/base/action"
+    _cp_path = "/web/action"
 
     @openerpweb.jsonrequest
     def load(self, req, action_id):
@@ -1064,7 +1064,7 @@ class Action(openerpweb.Controller):
             [action_id], req.session.eval_context(req.context)))
 
 class TreeView(View):
-    _cp_path = "/base/treeview"
+    _cp_path = "/web/treeview"
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
@@ -1131,7 +1131,7 @@ def export_xls(fieldnames, table):
     return unicode(data, 'utf-8', 'replace')
 
 class Export(View):
-    _cp_path = "/base/export"
+    _cp_path = "/web/export"
 
     def fields_get(self, req, model):
         Model = req.session.model(model)
@@ -1290,7 +1290,7 @@ class Export(View):
             return export_csv(field, result)
 
 class Export(View):
-    _cp_path = "/base/report"
+    _cp_path = "/web/report"
 
     @openerpweb.jsonrequest
     def get_report(self, req, action):

addons/web/po/base.pot

@@ -0,0 +1,482 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-08-17 13:28+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: addons/web/static/src/js/form.js:1459
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#: addons/web/static/src/js/form.js:1472
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#: addons/web/static/src/js/form.js:1478
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "x"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "#{title}"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "#{text}"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Powered by"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "openerp.com"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Loading..."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Create"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Drop"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Backup"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Restore"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Password"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Back to Login"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "CREATE DATAweb"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Master password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "New dataweb name:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Load Demonstration data:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Default language:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Admin password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Confirm password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "DROP DATAweb"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Dataweb:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Master Password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "BACKUP DATAweb"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "RESTORE DATAweb"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "File:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "New master password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Confirm new master password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "User:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Password:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Dataweb"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Login"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Bad username or password"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "OpenERP's vision to be:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Full featured"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for "
+"each need."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Open Source"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "User Friendly"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "In order to be productive, people need clean and easy to use interface."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "-"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "rpc_session_id:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "1"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "LOGOUT"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "h3"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "<"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ">"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "</"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "h4"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Delete"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "First"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Last"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "♻"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "xml"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save & Edit"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Create & Edit"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "New"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "<<"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "0"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "/"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ">>"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Add"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Unhandled widget"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "?"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ":"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Open..."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Create..."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Search..."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "One2Many widget"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Uploading ..."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Select"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save As"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Clear"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Advanced Filter"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "-- Filters --"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "-- Actions --"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save Filter"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Manage Filters"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Filter Name:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "?"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Any of the following conditions must match"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "All the following conditions must match"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "None of the following conditions must match"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Add condition"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "and"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Cancel"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save & New"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save & Close"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Export"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid ""
+"This wizard will export all data that matches the current search criteria"
+" to a CSV file.\n"
+"                You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Export Type:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Import Compatible Export"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Export all Data"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Export Format"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "CSV"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Excel"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Available fields"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Fields to export"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save fields list"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Remove"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Remove All"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Name"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "&nbsp;"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Save as:"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Ok"
+msgstr ""
+
+#: addons/web/static/src/xml/web.xml:0
+msgid "Saved exports:"
+msgstr ""
+

addons/web/po/fr_FR.po

@@ -18,16 +18,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: addons/base/static/src/js/form.js:1459
+#: addons/web/static/src/js/form.js:1459
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Chercher plus...</em>"
 
-#: addons/base/static/src/js/form.js:1472
+#: addons/web/static/src/js/form.js:1472
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Créer \"<strong>%s</strong>\"</em>"
 
-#: addons/base/static/src/js/form.js:1478
+#: addons/web/static/src/js/form.js:1478
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Créer et éditer...</em>"