diff options
| author | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
| commit | e2d9e9e2f7f1e0728e46836fcaacebaf38d7bed1 (patch) | |
| tree | 252b9180aa13d5fe3ec601911d62a88f63c47b17 | |
| parent | c7264344a838575b62be221a6df004b1bcfd0f83 (diff) | |
| parent | 6e943465be4c6df2a356b93e7be8a1da4eb8d74f (diff) | |
[MERGE] Merged latest trunk.
bzr revid: vta@openerp.com-20120830070501-qy3am8pj7q3xm0oi
357 files changed, 2004 insertions, 1730 deletions
diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 8c2a8fa0909..38e3328bf8b 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -1,16 +1,16 @@ { - "name" : "Web", - "category": "Hidden", - "description": + 'name': 'Web', + 'category': 'Hidden', + 'description': """ OpenERP Web core module. ======================== This module provides the core of the OpenERP Web Client. """, - "depends" : [], + 'depends': [], 'auto_install': True, - 'post_load' : 'wsgi_postload', + 'post_load': 'wsgi_postload', 'js' : [ "static/lib/datejs/globalization/en-US.js", "static/lib/datejs/core.js", @@ -68,5 +68,60 @@ This module provides the core of the OpenERP Web Client. ], 'qweb' : [ "static/src/xml/*.xml", + 'static/lib/datejs/globalization/en-US.js', + 'static/lib/datejs/core.js', + 'static/lib/datejs/parser.js', + 'static/lib/datejs/sugarpak.js', + 'static/lib/datejs/extras.js', + 'static/lib/jquery/jquery-1.7.2.js', + 'static/lib/jquery.MD5/jquery.md5.js', + 'static/lib/jquery.form/jquery.form.js', + 'static/lib/jquery.validate/jquery.validate.js', + 'static/lib/jquery.ba-bbq/jquery.ba-bbq.js', + 'static/lib/spinjs/spin.js', + 'static/lib/jquery.blockUI/jquery.blockUI.js', + 'static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js', + 'static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js', + 'static/lib/jquery.ui.notify/js/jquery.notify.js', + 'static/lib/jquery.deferred-queue/jquery.deferred-queue.js', + 'static/lib/jquery.scrollTo/jquery.scrollTo-min.js', + 'static/lib/jquery.tipsy/jquery.tipsy.js', + 'static/lib/jquery.textext/jquery.textext.js', + 'static/lib/jquery.timeago/jquery.timeago.js', + 'static/lib/qweb/qweb2.js', + 'static/lib/underscore/underscore.js', + 'static/lib/underscore/underscore.string.js', + 'static/lib/backbone/backbone.js', + 'static/lib/cleditor/jquery.cleditor.js', + 'static/lib/py.js/lib/py.js', + 'static/src/js/boot.js', + 'static/src/js/corelib.js', + 'static/src/js/coresetup.js', + 'static/src/js/dates.js', + 'static/src/js/formats.js', + 'static/src/js/chrome.js', + 'static/src/js/views.js', + 'static/src/js/data.js', + 'static/src/js/data_export.js', + 'static/src/js/data_import.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', + ], + 'css': [ + 'static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css', + 'static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css', + 'static/lib/jquery.ui.notify/css/ui.notify.css', + 'static/lib/jquery.tipsy/tipsy.css', + 'static/lib/jquery.textext/jquery.textext.css', + 'static/src/css/base.css', + 'static/src/css/data_export.css', + 'static/src/css/data_import.css', + 'static/lib/cleditor/jquery.cleditor.css', + ], + 'qweb': [ + 'static/src/xml/*.xml', ], } diff --git a/addons/web/common/session.py b/addons/web/common/session.py index 5906ee6314e..45bbb32f64c 100644 --- a/addons/web/common/session.py +++ b/addons/web/common/session.py @@ -104,12 +104,6 @@ class OpenERPSession(object): del state['config'] return state - def openerp_entreprise(self): - if not self._uid: - return False - else: - return self.model('publisher_warranty.contract').status()['status'] == 'full' - def build_connection(self): conn = openerplib.Connection(self.config.connector, database=self._db, login=self._login, user_id=self._uid, password=self._password) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index ed32b2239c3..f9c36a1f0c0 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -806,7 +806,6 @@ class Session(openerpweb.Controller): "context": req.session.get_context() if req.session._uid else {}, "db": req.session._db, "login": req.session._login, - "openerp_entreprise": req.session.openerp_entreprise(), } @openerpweb.jsonrequest diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po index 498c78516be..3ba35d1dc59 100644 --- a/addons/web/i18n/ar.po +++ b/addons/web/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po index 775314cd39e..0c949bcbd8e 100644 --- a/addons/web/i18n/bg.po +++ b/addons/web/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po index 96aff0694c1..5302f0c2475 100644 --- a/addons/web/i18n/bn.po +++ b/addons/web/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po index e2aff2f0b09..98f7b651e81 100644 --- a/addons/web/i18n/bs.po +++ b/addons/web/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po index 6c5cce42b4a..0d6025bf82c 100644 --- a/addons/web/i18n/ca.po +++ b/addons/web/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po index e03171f930f..1ba20c822b9 100644 --- a/addons/web/i18n/cs.po +++ b/addons/web/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po index d4a5cc6efad..71f548415c2 100644 --- a/addons/web/i18n/da.po +++ b/addons/web/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po index bd7f20ec818..a5eb33b65f8 100644 --- a/addons/web/i18n/de.po +++ b/addons/web/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po index 6d7490923f6..c6212e2ad88 100644 --- a/addons/web/i18n/en_AU.po +++ b/addons/web/i18n/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po index 83c3325e793..3e4a554b400 100644 --- a/addons/web/i18n/en_GB.po +++ b/addons/web/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index 74e77381873..16e92bb71b0 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po index 5e65aad781f..a66db88bbe2 100644 --- a/addons/web/i18n/es_CL.po +++ b/addons/web/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po index 953aacbfb3d..7c01a2104c4 100644 --- a/addons/web/i18n/es_CR.po +++ b/addons/web/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: es\n" #. openerp-web diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po index 7eb680fc806..5683e05fd95 100644 --- a/addons/web/i18n/es_EC.po +++ b/addons/web/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po index 96c99115ff1..d8cac4ed68f 100644 --- a/addons/web/i18n/et.po +++ b/addons/web/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po index 38dc8244b97..901df5e6f3a 100644 --- a/addons/web/i18n/eu.po +++ b/addons/web/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po index c4d36e63a43..e95a6471d81 100644 --- a/addons/web/i18n/fi.po +++ b/addons/web/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po index 9e0a92f76cf..a7e6e4140d7 100644 --- a/addons/web/i18n/fr.po +++ b/addons/web/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po index bfd81ef9938..594a27bce2d 100644 --- a/addons/web/i18n/fr_CA.po +++ b/addons/web/i18n/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po index 6471ce44d60..19483531a48 100644 --- a/addons/web/i18n/gl.po +++ b/addons/web/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po index 778e78b55b2..b334ecb0bb0 100644 --- a/addons/web/i18n/gu.po +++ b/addons/web/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po index 21c023f5560..d80dd1c4fc7 100644 --- a/addons/web/i18n/hi.po +++ b/addons/web/i18n/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po index da768b45e9e..b95e832c834 100644 --- a/addons/web/i18n/hr.po +++ b/addons/web/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po index 8a3b6507d5d..b6af9f9bd9e 100644 --- a/addons/web/i18n/hu.po +++ b/addons/web/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-06-04 12:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-08-24 09:16+0000\n" +"Last-Translator: Herczeg Péter <herczegp@gmail.com>\n" "Language-Team: Hungarian <hu@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: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -124,7 +124,7 @@ msgstr "Névjegy" #. openerp-web #: addons/web/static/src/js/chrome.js:1052 msgid "OpenERP - Unsupported/Community Version" -msgstr "" +msgstr "OpenERP - Támogatás nélküli / Közösségi verzió" #. openerp-web #: addons/web/static/src/js/coresetup.js:619 @@ -189,7 +189,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/data_export.js:6 msgid "Export Data" -msgstr "" +msgstr "Adatok exportálása" #. openerp-web #: addons/web/static/src/js/data_export.js:19 @@ -200,12 +200,12 @@ msgstr "" #: addons/web/static/src/js/view_form.js:3298 #: addons/web/static/src/js/views.js:968 msgid "Close" -msgstr "" +msgstr "Bezárás" #. openerp-web #: addons/web/static/src/js/data_export.js:20 msgid "Export To File" -msgstr "" +msgstr "Exportálás fájlba" #. openerp-web #: addons/web/static/src/js/data_export.js:126 @@ -220,17 +220,17 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/data_export.js:375 msgid "Please select fields to export..." -msgstr "" +msgstr "Kérjük válassza ki az exportálandó mezÅ‘ket..." #. openerp-web #: addons/web/static/src/js/data_import.js:34 msgid "Import Data" -msgstr "" +msgstr "Adatok importálása" #. openerp-web #: addons/web/static/src/js/data_import.js:71 msgid "Import File" -msgstr "" +msgstr "Fájl importálása" #. openerp-web #: addons/web/static/src/js/data_import.js:106 @@ -247,7 +247,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/data_import.js:383 msgid "*Required Fields are not selected :" -msgstr "" +msgstr "*Szükséges mezÅ‘k nincsennek kiválasztva:" #. openerp-web #: addons/web/static/src/js/formats.js:139 @@ -298,12 +298,12 @@ msgstr "" #: addons/web/static/src/js/search.js:1108 #, python-format msgid "Group by: %s" -msgstr "" +msgstr "CsoportosÃtás: %s" #. openerp-web #: addons/web/static/src/js/search.js:1132 msgid "GroupBy" -msgstr "" +msgstr "CsoportosÃtás" #. openerp-web #: addons/web/static/src/js/search.js:1267 @@ -357,12 +357,12 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/search.js:1341 msgid "contains" -msgstr "" +msgstr "tartalmazza" #. openerp-web #: addons/web/static/src/js/search.js:1342 msgid "doesn't contain" -msgstr "" +msgstr "nem tartalmazza" #. openerp-web #: addons/web/static/src/js/search.js:1343 @@ -371,7 +371,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1401 #: addons/web/static/src/js/search.js:1424 msgid "is equal to" -msgstr "" +msgstr "egyenlÅ‘" #. openerp-web #: addons/web/static/src/js/search.js:1344 @@ -380,7 +380,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1402 #: addons/web/static/src/js/search.js:1425 msgid "is not equal to" -msgstr "" +msgstr "nem egyenlÅ‘" #. openerp-web #: addons/web/static/src/js/search.js:1345 @@ -389,7 +389,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1403 #: addons/web/static/src/js/search.js:1426 msgid "greater than" -msgstr "" +msgstr "nagyobb, mint" #. openerp-web #: addons/web/static/src/js/search.js:1346 @@ -398,7 +398,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1404 #: addons/web/static/src/js/search.js:1427 msgid "less than" -msgstr "" +msgstr "kisebb, mint" #. openerp-web #: addons/web/static/src/js/search.js:1347 @@ -407,7 +407,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1405 #: addons/web/static/src/js/search.js:1428 msgid "greater or equal than" -msgstr "" +msgstr "nagyobb vagy egyenlÅ‘, mint" #. openerp-web #: addons/web/static/src/js/search.js:1348 @@ -416,28 +416,28 @@ msgstr "" #: addons/web/static/src/js/search.js:1406 #: addons/web/static/src/js/search.js:1429 msgid "less or equal than" -msgstr "" +msgstr "kisebb vagy egyenlÅ‘, mint" #. openerp-web #: addons/web/static/src/js/search.js:1419 #: addons/web/static/src/js/search.js:1444 msgid "is" -msgstr "" +msgstr "egyenlÅ‘" #. openerp-web #: addons/web/static/src/js/search.js:1445 msgid "is not" -msgstr "" +msgstr "nem egyenlÅ‘" #. openerp-web #: addons/web/static/src/js/search.js:1459 msgid "is true" -msgstr "" +msgstr "igaz" #. openerp-web #: addons/web/static/src/js/search.js:1460 msgid "is false" -msgstr "" +msgstr "hamis" #. openerp-web #: addons/web/static/src/js/view_editor.js:20 @@ -538,7 +538,7 @@ msgstr "Duplikálás" #: addons/web/static/src/js/view_form.js:133 #: addons/web/static/src/js/view_form.js:728 msgid "Set Default" -msgstr "Alapértelmezés beállÃtása" +msgstr "Alapértelmezett értékek beállÃtása" #. openerp-web #: addons/web/static/src/js/view_page.js:59 @@ -549,7 +549,7 @@ msgstr "Biztos, hogy törölni akarja ezt a rekordot?" #: addons/web/static/src/js/view_form.js:508 msgid "" "Warning, the record has been modified, your changes will be discarded." -msgstr "" +msgstr "Figyelem, a rekord tartalma megváltozott, a változások elvesznek." #. openerp-web #: addons/web/static/src/js/view_form.js:735 @@ -640,18 +640,18 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/view_list.js:8 msgid "List" -msgstr "" +msgstr "Lista" #. openerp-web #: addons/web/static/src/js/view_list.js:277 msgid "Unlimited" -msgstr "" +msgstr "Korlátlan" #. openerp-web #: addons/web/static/src/js/views.js:819 #: addons/web/static/src/xml/base.xml:1742 msgid "Import" -msgstr "" +msgstr "Import" #. openerp-web #: addons/web/static/src/js/views.js:822 @@ -662,7 +662,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/view_list.js:374 msgid "Group" -msgstr "" +msgstr "Csoport" #. openerp-web #: addons/web/static/src/js/view_list.js:549 @@ -672,7 +672,7 @@ msgstr "Biztos, hogy törölni akarja ezeket a rekordokat?" #. openerp-web #: addons/web/static/src/js/views.js:925 msgid "Warning" -msgstr "" +msgstr "Figyelmeztetés" #. openerp-web #: addons/web/static/src/js/view_list.js:716 @@ -725,17 +725,17 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/views.js:716 msgid "Print" -msgstr "" +msgstr "Nyomtatás" #. openerp-web #: addons/web/static/src/js/views.js:717 msgid "Attachment" -msgstr "" +msgstr "Melléklet" #. openerp-web #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276 msgid "More" -msgstr "" +msgstr "Egyebek" #. openerp-web #: addons/web/static/src/js/views.js:810 @@ -760,7 +760,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/views.js:885 msgid "Do you really want to delete this attachment ?" -msgstr "" +msgstr "Valóban törölni szeretné ezt a mellékletet?" #. openerp-web #: addons/web/static/src/js/views.js:962 @@ -770,7 +770,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:52 msgid "Loading..." -msgstr "" +msgstr "Betöltés…" #. openerp-web #: addons/web/static/src/xml/base.xml:251 @@ -956,12 +956,12 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:325 msgid "About OpenERP" -msgstr "" +msgstr "OpenERP - Névjegy" #. openerp-web #: addons/web/static/src/xml/base.xml:327 msgid "Log out" -msgstr "" +msgstr "Kijelentkezés" #. openerp-web #: addons/web/static/src/xml/base.xml:333 @@ -1111,7 +1111,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:518 msgid "Delete this attachment" -msgstr "" +msgstr "Melléklet törlése" #. openerp-web #: addons/web/static/src/xml/base.xml:523 @@ -1132,7 +1132,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:687 msgid "Discard" -msgstr "" +msgstr "Elvetés" #. openerp-web #: addons/web/static/src/xml/base.xml:806 @@ -1142,17 +1142,17 @@ msgstr "Alapértelmezett:" #. openerp-web #: addons/web/static/src/xml/base.xml:823 msgid "Condition:" -msgstr "" +msgstr "Feltétel:" #. openerp-web #: addons/web/static/src/xml/base.xml:842 msgid "Only you" -msgstr "" +msgstr "csak saját" #. openerp-web #: addons/web/static/src/xml/base.xml:849 msgid "All users" -msgstr "" +msgstr "Minden felhasználó" #. openerp-web #: addons/web/static/src/xml/base.xml:856 @@ -1208,7 +1208,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:973 msgid "Change default:" -msgstr "" +msgstr "Alapértelmezett megváltoztatása:" #. openerp-web #: addons/web/static/src/xml/base.xml:977 @@ -1228,7 +1228,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1040 msgid "Open this resource" -msgstr "" +msgstr "ErÅ‘forrás megnyitása" #. openerp-web #: addons/web/static/src/xml/base.xml:1063 @@ -1259,7 +1259,7 @@ msgstr "Törlés" #: addons/web/static/src/xml/base.xml:1179 #: addons/web/static/src/xml/base.xml:1230 msgid "Uploading ..." -msgstr "" +msgstr "Feltöltés..." #. openerp-web #: addons/web/static/src/xml/base.xml:1066 @@ -1316,7 +1316,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1205 msgid "Advanced Search..." -msgstr "" +msgstr "Részletes keresés…" #. openerp-web #: addons/web/static/src/xml/base.xml:1287 @@ -1341,7 +1341,7 @@ msgstr "SzűrÅ‘ mentése" #. openerp-web #: addons/web/static/src/xml/base.xml:1305 msgid "Filter Name:" -msgstr "" +msgstr "SzűrÅ‘ neve:" #. openerp-web #: addons/web/static/src/xml/base.xml:1307 @@ -1351,12 +1351,12 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1376 msgid "Custom Filters" -msgstr "" +msgstr "Egyedi szűrÅ‘k" #. openerp-web #: addons/web/static/src/xml/base.xml:1379 msgid "Save current filter" -msgstr "" +msgstr "Aktuális szűrés mentése" #. openerp-web #: addons/web/static/src/xml/base.xml:1381 @@ -1366,13 +1366,13 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1383 msgid "Share with all users" -msgstr "" +msgstr "Mindenkinek elérhetÅ‘" #. openerp-web #: addons/web/static/src/js/search.js:298 #: addons/web/static/src/xml/base.xml:1299 msgid "Add to Dashboard" -msgstr "" +msgstr "Hozzáadás vezérlÅ‘pulthoz" #. openerp-web #: addons/web/static/src/xml/base.xml:1394 @@ -1392,7 +1392,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1406 msgid "Advanced Search" -msgstr "" +msgstr "Részletes Keresés" #. openerp-web #: addons/web/static/src/xml/base.xml:1411 @@ -1402,7 +1402,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1412 msgid "Apply" -msgstr "" +msgstr "Alkalmazás" #. openerp-web #: addons/web/static/src/xml/base.xml:1509 @@ -1422,36 +1422,40 @@ msgid "" " You can export all data or only the fields that can be " "reimported after modification." msgstr "" +"Ez a varázsló exportálja az aktuális keresési feltételeknek megfelelÅ‘ összes " +"adatot egy CSV fájlba.\n" +" LehetÅ‘ség van valamennyi adat exportálására vagy csak azon " +"mezÅ‘kére, amelyek változtatások után visszaimportálásra kerülnek." #. openerp-web #: addons/web/static/src/xml/base.xml:1624 msgid "Export Type:" -msgstr "" +msgstr "Exportálás tÃpusa" #. openerp-web #: addons/web/static/src/xml/base.xml:1626 msgid "Import Compatible Export" -msgstr "" +msgstr "Import/export kompatibilis" #. openerp-web #: addons/web/static/src/xml/base.xml:1627 msgid "Export all Data" -msgstr "" +msgstr "Összes adat exportálása" #. openerp-web #: addons/web/static/src/xml/base.xml:1630 msgid "Export Formats" -msgstr "" +msgstr "Export formátumok" #. openerp-web #: addons/web/static/src/xml/base.xml:1636 msgid "Available fields" -msgstr "" +msgstr "ElérhetÅ‘ mezÅ‘k" #. openerp-web #: addons/web/static/src/xml/base.xml:1638 msgid "Fields to export" -msgstr "" +msgstr "Exportálandó mezÅ‘k:" #. openerp-web #: addons/web/static/src/xml/base.xml:1640 @@ -1466,7 +1470,7 @@ msgstr "Összes eltávolÃtása" #. openerp-web #: addons/web/static/src/xml/base.xml:1666 msgid "Name" -msgstr "" +msgstr "Név" #. openerp-web #: addons/web/static/src/xml/base.xml:1699 @@ -1476,12 +1480,12 @@ msgstr "Mentés mint:" #. openerp-web #: addons/web/static/src/xml/base.xml:1706 msgid "Saved exports:" -msgstr "" +msgstr "Mentett exportálások:" #. openerp-web #: addons/web/static/src/xml/base.xml:1748 msgid "1. Import a .CSV file" -msgstr "" +msgstr ".CSV fájl importálása" #. openerp-web #: addons/web/static/src/xml/base.xml:1749 @@ -1503,7 +1507,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1759 msgid "Import Options" -msgstr "" +msgstr "Importálási beállÃtások" #. openerp-web #: addons/web/static/src/xml/base.xml:1763 @@ -1560,7 +1564,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1811 msgid "Here is a preview of the file we could not import:" -msgstr "" +msgstr "Itt van a fájlnak az elÅ‘nézete, amit nem tudunk importálni:" #~ msgid "Create..." #~ msgstr "Létrehozás…" @@ -1603,3 +1607,30 @@ msgstr "" #~ msgid "More…" #~ msgstr "Több..." + +#~ msgid "Any of the following conditions must match" +#~ msgstr "Bármelyik feltétel igaz" + +#~ msgid "All the following conditions must match" +#~ msgstr "Midegyik feltétel igaz" + +#~ msgid "None of the following conditions must match" +#~ msgstr "Egyik feltétel sem igaz" + +#~ msgid "Links" +#~ msgstr "Hivatkozások" + +#~ msgid "Add condition" +#~ msgstr "Feltétel hozzáadása" + +#~ msgid "Unfold menu" +#~ msgstr "Menü kibontása" + +#~ msgid "Fold menu" +#~ msgstr "Menü elrejtése" + +#~ msgid "Disable all tips" +#~ msgstr "Minden tipp tiltása" + +#~ msgid "Hide this tip" +#~ msgstr "Tii elrejtése" diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po index f1bd452b6bd..f374b325afa 100644 --- a/addons/web/i18n/id.po +++ b/addons/web/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po index ee0f096eda7..1cfd2637a61 100644 --- a/addons/web/i18n/it.po +++ b/addons/web/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po index affb27e9acf..772832fb034 100644 --- a/addons/web/i18n/ja.po +++ b/addons/web/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po index f875f727a4f..1a8ee713848 100644 --- a/addons/web/i18n/ka.po +++ b/addons/web/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po index c1504ec7ae4..cd2aa466809 100644 --- a/addons/web/i18n/mk.po +++ b/addons/web/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po index 25bc63906da..a171aed6be2 100644 --- a/addons/web/i18n/mn.po +++ b/addons/web/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po index ca269b242b0..e0107459add 100644 --- a/addons/web/i18n/nb.po +++ b/addons/web/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po index b04df56f3dd..eec0a770d12 100644 --- a/addons/web/i18n/nl.po +++ b/addons/web/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po index 416ef765127..ccfe3ccedbe 100644 --- a/addons/web/i18n/nl_BE.po +++ b/addons/web/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po index 0110ed205f5..b637c93321e 100644 --- a/addons/web/i18n/pl.po +++ b/addons/web/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po index 8166d9e0f22..c0333fcd8ac 100644 --- a/addons/web/i18n/pt.po +++ b/addons/web/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po index 3d0b5dd72ae..1c096ca1c99 100644 --- a/addons/web/i18n/pt_BR.po +++ b/addons/web/i18n/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po index 7f32fc3db44..9b4542c91e2 100644 --- a/addons/web/i18n/ro.po +++ b/addons/web/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po index abc6f64d863..1f7b96ab0e2 100644 --- a/addons/web/i18n/ru.po +++ b/addons/web/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po index dddf69edd89..3f3a14c89fb 100644 --- a/addons/web/i18n/sk.po +++ b/addons/web/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po index 6953dfae170..a90e26131ba 100644 --- a/addons/web/i18n/sl.po +++ b/addons/web/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po index abec3f0edee..f7a00d31e3f 100644 --- a/addons/web/i18n/sq.po +++ b/addons/web/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:22+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po index 8ca06c6cdf9..5656116c127 100644 --- a/addons/web/i18n/sr@latin.po +++ b/addons/web/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po index 31db2f2f6d7..f3231e32bc8 100644 --- a/addons/web/i18n/sv.po +++ b/addons/web/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po index 5aeb203510d..87199089e33 100644 --- a/addons/web/i18n/tr.po +++ b/addons/web/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po index cb04d046af5..dd0aa2b2f4c 100644 --- a/addons/web/i18n/uk.po +++ b/addons/web/i18n/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:49+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index 4c8b46ec72a..a117e3e4119 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po index 8c6a6cb74e9..fe15b8da8f3 100644 --- a/addons/web/i18n/zh_TW.po +++ b/addons/web/i18n/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2276bb2445e..06a37a54727 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,6 +69,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -84,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -234,21 +235,9 @@ cursor: default; text-shadow: 0 1px 1px white !important; } -.openerp .ui-widget { - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; - font-size: 13px; -} .openerp .ui-widget-content a { color: #7c7bad; } -.openerp .ui-menu .ui-menu-item { - margin: 0 8px 0 0; - padding: 0 0 0 12px; - width: auto; -} -.openerp .ui-menu .ui-menu-item a.ui-state-active { - background: #f0f0fa; -} .openerp.ui-dialog { display: none; padding: 6px; @@ -505,8 +494,8 @@ margin: 4px; } .openerp .oe_avatar > img { - height: 90px; - max-width: 100px; + max-height: 90px; + max-width: 90px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -1012,7 +1001,7 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px lightgrey; + border-top: solid 1px #d3d3d3; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1037,14 +1026,6 @@ -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_topbar .oe_topbar_item .oe_active { - background: #303030; - font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -} .openerp .oe_topbar .oe_topbar_avatar { width: 24px; height: 24px; @@ -1155,10 +1136,10 @@ padding: 0; margin: 0; } -.openerp .oe_menu li { +.openerp .oe_menu > li { float: left; } -.openerp .oe_menu a { +.openerp .oe_menu > li > a { display: block; padding: 5px 10px 7px; line-height: 20px; @@ -1167,14 +1148,14 @@ vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } -.openerp .oe_menu a:hover { +.openerp .oe_menu > li > a:hover { background: #303030; color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_menu .oe_active { +.openerp .oe_menu > li > .oe_active { background: #303030; font-weight: bold; color: white; @@ -1211,7 +1192,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1226,10 +1207,17 @@ margin: 0px; padding: 1px 4px; } +.openerp .oe_secondary_submenu .oe_menu_counter:hover { + cursor: pointer; + border: 1px solid #c81010; + -moz-box-shadow: 0 0 2px #c81010; + -webkit-box-shadow: 0 0 2px #c81010; + box-shadow: 0 0 2px #c81010; +} .openerp .oe_secondary_submenu .oe_active { background: #7c7bad; - border-top: 1px solid lightgrey; - border-bottom: 1px solid lightgrey; + border-top: 1px solid lightGray; + border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1321,6 +1309,9 @@ .openerp .oe_view_manager table.oe_view_manager_header h2 a { color: #7c7bad; } +.openerp .oe_view_manager table.oe_view_manager_header .oe_dropdown_menu { + line-height: normal; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; border: 1px solid #ababab; @@ -1959,8 +1950,10 @@ margin: 0 auto; padding: 16px 0 48px; } -.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 25px 0 10px 0; +.openerp .oe_form .oe_grey { + color: #aaaaaa; + max-width: 650px; + margin: 0 0 10px 0; } .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; @@ -1969,6 +1962,12 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { + padding: 2px 0; +} +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { + padding: 1px 0; +} .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; @@ -2005,7 +2004,6 @@ padding-left: 24px; margin: 0; position: relative; - z-index: 10; } .openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { width: 17px; @@ -2016,7 +2014,6 @@ } .openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { position: relative; - z-index: 11; width: 24px; height: 24px; display: inline-block; @@ -2160,7 +2157,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 120px; + min-width: 160px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; @@ -2179,7 +2176,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; @@ -2191,8 +2188,8 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 8px 0px 8px 0px; - color: #53637e; + margin: 15px 0px 10px 0px; + color: #7c7bad; } .openerp .oe_horizontal_separator:empty { height: 5px; @@ -2405,6 +2402,13 @@ float: right; padding-left: 2px; } +.openerp.ui-autocomplete li.oe_m2o_dropdown_option a { + font-style: italic; + padding-left: 2em; +} +.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { + margin-top: 10px; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } @@ -2729,6 +2733,16 @@ float: right; color: #333333; } +.openerp .oe_semantic_html li { + list-style-type: disc; + display: list-item; +} +.openerp .oe_semantic_html ul { + padding-left: 1em; +} +.openerp .oe_semantic_html p { + color: #4c4c4c !important; +} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); @@ -2744,3 +2758,42 @@ div.ui-widget-overlay { filter: alpha(opacity=30); opacity: 0.3; } + +.ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + color: #4c4c4c; + font-size: 13px; +} + +.ui-menu { + padding: 2px 0; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + margin-top: 4px; + border: 1px solid #afafb6; +} +.ui-menu .ui-menu-item { + width: 100%; + padding: 0; +} +.ui-menu .ui-menu-item a { + padding: 1px 16px; +} +.ui-menu .ui-menu-item a.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} +.ui-menu .ui-menu-item a.ui-state-active { + background: #f0f0fa; +} +.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active { + background: #7c7bad; +} + +.ui-corner-all { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 653adad7813..c238ef6ee07 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -249,18 +249,8 @@ $sheet-max-width: 860px text-shadow: 0 1px 1px #fff !important // }}} // Jquery ui Overrides {{{ - .ui-widget - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - font-size: 13px .ui-widget-content a color: $link-color - .ui-menu - .ui-menu-item - margin: 0 8px 0 0 - padding: 0 0 0 12px - width: auto - a.ui-state-active - background: #f0f0fa // Modal box &.ui-dialog @@ -400,6 +390,7 @@ $sheet-max-width: 860px @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_form_dirty .oe_highlight_on_dirty color: white @@ -426,8 +417,8 @@ $sheet-max-width: 860px margin: 4px .oe_avatar > img - height: 90px - max-width: 100px + max-height: 90px + max-width: 90px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none @@ -814,11 +805,6 @@ $sheet-max-width: 860px background: #303030 color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) .oe_topbar_avatar width: 24px @@ -906,25 +892,25 @@ $sheet-max-width: 860px float: left padding: 0 margin: 0 - li + > li float: left - a - display: block - padding: 5px 10px 7px - line-height: 20px - height: 20px - color: #eee - vertical-align: top - text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover + > a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + > .oe_active background: #303030 + font-weight: bold color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) .oe_secondary_menu_section font-weight: bold margin-left: 8px @@ -959,6 +945,10 @@ $sheet-max-width: 860px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px padding: 1px 4px + &:hover + cursor: pointer + border: 1px solid #C81010 + @include box-shadow(0 0 2px #C81010) .oe_active background: $link-color border-top: 1px solid lightGray @@ -1039,6 +1029,8 @@ $sheet-max-width: 860px float: left a color: $link-color + .oe_dropdown_menu + line-height: normal .oe_button_group display: inline-block border: 1px solid #ababab @@ -1524,14 +1516,20 @@ $sheet-max-width: 860px max-width: $sheet-max-width margin: 0 auto padding: 16px 0 48px + .oe_grey + color: #aaa + max-width: 650px + margin: 0 0 10px 0 div.oe_form_configuration - div.oe_horizontal_separator - margin: 25px 0 10px 0 p color: #aaa max-width: 650px label min-width: 150px + .oe_form_group_cell_label + padding: 2px 0 + .oe_form_group_cell div div + padding: 1px 0 ul.oe_form_steps, ul.oe_form_steps_clickable @@ -1558,7 +1556,6 @@ $sheet-max-width: 860px padding-left: 24px margin: 0 position: relative - z-index: 10 .arrow width: 17px display: inline-block @@ -1567,7 +1564,6 @@ $sheet-max-width: 860px margin-left: -5px span position: relative - z-index: 11 width: 24px height: 24px display: inline-block @@ -1654,7 +1650,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 120px + min-width: 160px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group @@ -1683,8 +1679,8 @@ $sheet-max-width: 860px .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 8px 0px 8px 0px - color: #53637e + margin: 15px 0px 10px 0px + color: $section-title-color .oe_horizontal_separator:empty height: 5px .oe_vertical_separator @@ -1857,6 +1853,12 @@ $sheet-max-width: 860px line-height: 14px float: right padding-left: 2px + &.ui-autocomplete + li.oe_m2o_dropdown_option a + font-style: italic + padding-left: 2em + li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option + margin-top: 10px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -2130,6 +2132,15 @@ $sheet-max-width: 860px float: right color: #333 // }}} + .oe_semantic_html // a style to use normal html + li + list-style-type: disc + display: list-item + ul + padding-left: 1em + p + color: #4C4C4C !important + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) @@ -2140,10 +2151,37 @@ $sheet-max-width: 860px // }}} -// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!! +// The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!! div.ui-widget-overlay background: black @include opacity(0.3) +.ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + color: #4c4c4c + font-size: 13px + +.ui-menu + padding: 2px 0 + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + margin-top: 4px + border: 1px solid $tag-border + .ui-menu-item + width: 100% + padding: 0 + a + padding: 1px 16px + a.ui-corner-all + @include radius(0) + a.ui-state-active + background: #f0f0fa + .ui-menu-item a.ui-state-hover, .ui-menu-item a.ui-state-active + background: $tag-bg-dark + //color: #4c4c4c + //@include vertical-gradient(#f0f0fa, #eeeef6) + +.ui-corner-all + @include radius(3px) + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ff066c9f425..736e10875f6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -13,7 +13,7 @@ instance.web.Notification = instance.web.Widget.extend({ }, start: function() { this._super.apply(this, arguments); - this.$element.notify({ + this.$el.notify({ speed: 500, expires: 2500 }); @@ -24,7 +24,7 @@ instance.web.Notification = instance.web.Widget.extend({ if (sticky) { opts.expires = false; } - this.$element.notify('create', { + this.$el.notify('create', { title: title, text: text }, opts); @@ -35,7 +35,7 @@ instance.web.Notification = instance.web.Widget.extend({ if (sticky) { opts.expires = false; } - this.$element.notify('create', 'oe_notification_alert', { + this.$el.notify('create', 'oe_notification_alert', { title: title, text: text }, opts); @@ -123,22 +123,22 @@ instance.web.Dialog = instance.web.Widget.extend({ if (! this.dialog_inited) this.init_dialog(); var o = this.get_options(options); - instance.web.dialog(this.$element, o).dialog('open'); + instance.web.dialog(this.$el, o).dialog('open'); if (o.height === 'auto' && o.max_height) { - this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' }); + this.$el.css({ 'max-height': o.max_height, 'overflow-y': 'auto' }); } return this; }, init_dialog: function(options) { this.renderElement(); var o = this.get_options(options); - instance.web.dialog(this.$element, o); + instance.web.dialog(this.$el, o); var res = this.start(); this.dialog_inited = true; return res; }, close: function() { - this.$element.dialog('close'); + this.$el.dialog('close'); }, on_close: function() { if (this.__tmp_dialog_destroying) @@ -161,7 +161,7 @@ instance.web.Dialog = instance.web.Widget.extend({ this.__tmp_dialog_destroying = undefined; } if (! this.isDestroyed()) { - this.$element.dialog('destroy'); + this.$el.dialog('destroy'); } this._super(); } @@ -193,29 +193,9 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ on_traceback: function(error) { var self = this; var buttons = {}; - if (instance.session.openerp_entreprise) { - buttons[_t("Send OpenERP Enterprise Report")] = function() { - var $this = $(this); - var issuename = $('#issuename').val(); - var explanation = $('#explanation').val(); - var remark = $('#remark').val(); - // Call the send method from server to send mail with details - new instance.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){ - if (result === false) { - alert('There was a communication error.'); - } else { - $this.dialog('close'); - } - }); - }; - buttons[_t("Dont send")] = function() { - $(this).dialog("close"); - }; - } else { - buttons[_t("Ok")] = function() { - $(this).dialog("close"); - }; - } + buttons[_t("Ok")] = function() { + $(this).dialog("close"); + }; var dialog = new instance.web.Dialog(this, { title: "OpenERP " + _.str.capitalize(error.type), width: '80%', @@ -224,7 +204,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ min_height: '600px', buttons: buttons }).open(); - dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.session, error: error})); + dialog.$el.html(QWeb.render('CrashManager.error', {session: instance.session, error: error})); }, on_javascript_exception: function(exception) { this.on_traceback({ @@ -270,12 +250,12 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { if (instance.session.debug) { - this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count)); + this.$el.text(_.str.sprintf( _t("Loading (%d)"), this.count)); } else { - this.$element.text(_t("Loading")); + this.$el.text(_t("Loading")); } - this.$element.show(); - this.getParent().$element.addClass('oe_wait'); + this.$el.show(); + this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; clearTimeout(this.long_running_timer); @@ -284,8 +264,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.blocked_ui = false; instance.web.unblockUI(); } - this.$element.fadeOut(); - this.getParent().$element.removeClass('oe_wait'); + this.$el.fadeOut(); + this.getParent().$el.removeClass('oe_wait'); } } }); @@ -317,7 +297,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ do_render: function() { var self = this; instance.webclient.toggle_bars(true); - self.$element.html(QWeb.render("DatabaseManager", { widget : self })); + self.$el.html(QWeb.render("DatabaseManager", { widget : self })); $('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self })); $('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self })); $('ul.oe_secondary_submenu > li:first').addClass('oe_active') @@ -329,14 +309,14 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ event.preventDefault(); }); $('#back-to-login').click(self.do_exit); - self.$element.find("td").addClass("oe_form_group_cell"); - self.$element.find("tr td:first-child").addClass("oe_form_group_cell_label"); - self.$element.find("label").addClass("oe_form_label"); - self.$element.find("form[name=create_db_form]").validate({ submitHandler: self.do_create }); - self.$element.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); - self.$element.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); - self.$element.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); - self.$element.find("form[name=change_pwd_form]").validate({ + self.$el.find("td").addClass("oe_form_group_cell"); + self.$el.find("tr td:first-child").addClass("oe_form_group_cell_label"); + self.$el.find("label").addClass("oe_form_label"); + self.$el.find("form[name=create_db_form]").validate({ submitHandler: self.do_create }); + self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); + self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); + self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); + self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", new_pwd: "Please enter your new password", @@ -349,7 +329,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }); }, destroy: function () { - this.$element.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty(); + this.$el.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty(); this._super(); }, /** @@ -411,7 +391,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ 'login': 'admin', 'password': form_obj['create_admin_pwd'], 'login_successful': function() { - instance.webclient.show_application(); + self.do_action("reload"); }, }, }; @@ -500,7 +480,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }); }, do_exit: function () { - this.$element.remove(); + this.$el.remove(); instance.webclient.toggle_bars(false); this.do_action('login'); } @@ -533,8 +513,8 @@ instance.web.Login = instance.web.Widget.extend({ }, start: function() { var self = this; - self.$element.find("form").submit(self.on_submit); - self.$element.find('.oe_login_manage_db').click(function() { + self.$el.find("form").submit(self.on_submit); + self.$el.find('.oe_login_manage_db').click(function() { self.do_action("database_manager"); }); var d; @@ -584,7 +564,7 @@ instance.web.Login = instance.web.Widget.extend({ */ do_login: function (db, login, password) { var self = this; - this.$element.removeClass('oe_login_invalid'); + this.$el.removeClass('oe_login_invalid'); self.$(".oe_login_pane").fadeOut("slow"); return this.session.session_authenticate(db, login, password).pipe(function() { if (self.has_local_storage) { @@ -603,7 +583,7 @@ instance.web.Login = instance.web.Widget.extend({ self.trigger('login_successful'); },function () { self.$(".oe_login_pane").fadeIn("fast", function() { - self.$element.addClass("oe_login_invalid"); + self.$el.addClass("oe_login_invalid"); }); }); }, @@ -663,7 +643,7 @@ instance.web.ChangePassword = instance.web.Widget.extend({ template: "ChangePassword", start: function() { var self = this; - self.$element.validate({ + self.$el.validate({ submitHandler: function (form) { self.rpc("/web/session/change_password",{ 'fields': $(form).serializeArray() @@ -700,7 +680,7 @@ instance.web.Menu = instance.web.Widget.extend({ }, start: function() { this._super.apply(this, arguments); - this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container'); + this.$secondary_menus = this.getParent().$el.find('.oe_secondary_menus_container'); this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click); return this.do_reload(); }, @@ -712,8 +692,13 @@ instance.web.Menu = instance.web.Widget.extend({ this.data = data; this.renderElement(); this.limit_entries(); + // Hide toplevel item if there is only one + var $toplevel = this.$("li") + if($toplevel.length == 1) { + $toplevel.hide(); + } this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this })); - this.$element.on('click', 'a[data-menu]', this.on_menu_click); + this.$el.on('click', 'a[data-menu]', this.on_menu_click); // Hide second level submenus this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide(); if (self.current_menu) { @@ -728,8 +713,9 @@ instance.web.Menu = instance.web.Widget.extend({ } if (maximum_visible_links < this.data.data.children.length) { var $more = $(QWeb.render('Menu.more')), - $index = this.$element.find('li').eq(maximum_visible_links - 1); + $index = this.$el.find('li').eq(maximum_visible_links - 1); $index.after($more); + //$('.oe_topbar').append($more); $more.find('.oe_menu_more').append($index.next().nextAll()); } }, @@ -746,19 +732,19 @@ instance.web.Menu = instance.web.Widget.extend({ */ open_menu: function (id) { var $clicked_menu, $sub_menu, $main_menu; - $clicked_menu = this.$element.add(this.$secondary_menus).find('a[data-menu=' + id + ']'); + $clicked_menu = this.$el.add(this.$secondary_menus).find('a[data-menu=' + id + ']'); this.trigger('open_menu', id, $clicked_menu); if (this.$secondary_menus.has($clicked_menu).length) { $sub_menu = $clicked_menu.parents('.oe_secondary_menu'); - $main_menu = this.$element.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']'); + $main_menu = this.$el.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']'); } else { $sub_menu = this.$secondary_menus.find('.oe_secondary_menu[data-menu-parent=' + $clicked_menu.attr('data-menu') + ']'); $main_menu = $clicked_menu; } // Activate current main menu - this.$element.find('.oe_active').removeClass('oe_active'); + this.$el.find('.oe_active').removeClass('oe_active'); $main_menu.addClass('oe_active'); // Show current sub menu @@ -785,7 +771,7 @@ instance.web.Menu = instance.web.Widget.extend({ * @param {Number} id the action_id to match */ open_action: function (id) { - var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id="' + id + '"]'); + var $menu = this.$el.add(this.$secondary_menus).find('a[data-action-id="' + id + '"]'); var menu_id = $menu.data('menu'); if (menu_id) { this.open_menu(menu_id); @@ -801,14 +787,14 @@ instance.web.Menu = instance.web.Widget.extend({ if (!id) { return; } // find back the menuitem in dom to get the action - var $item = this.$element.find('a[data-menu=' + id + ']'); + var $item = this.$el.find('a[data-menu=' + id + ']'); if (!$item.length) { $item = this.$secondary_menus.find('a[data-menu=' + id + ']'); } var action_id = $item.data('action-id'); // If first level menu doesnt have action trigger first leaf if (!action_id) { - if(this.$element.has($item).length) { + if(this.$el.has($item).length) { var $sub_menu = this.$secondary_menus.find('.oe_secondary_menu[data-menu-parent=' + id + ']'); var $items = $sub_menu.find('a[data-action-id]').filter('[data-action-id!=""]'); if($items.length) { @@ -849,7 +835,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ start: function() { var self = this; this._super.apply(this, arguments); - this.$element.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) { + this.$el.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) { ev.preventDefault(); var f = self['on_menu_' + $(this).data('menu')]; if (f) { @@ -860,7 +846,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ do_update: function () { var self = this; var fct = function() { - var $avatar = self.$element.find('.oe_topbar_avatar'); + var $avatar = self.$el.find('.oe_topbar_avatar'); $avatar.attr('src', $avatar.data('default-src')); if (!self.session.uid) return; @@ -871,7 +857,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.session.db); if(res.company_id[0] > 1) topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]); - self.$element.find('.oe_topbar_name').text(topbar_name); + self.$el.find('.oe_topbar_name').text(topbar_name); var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=image_small&id=%s', self.session.prefix, self.session.session_id, self.session.uid); $avatar.attr('src', avatar_src); }); @@ -921,10 +907,10 @@ instance.web.Client = instance.web.Widget.extend({ }, bind_events: function() { var self = this; - this.$element.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() { + this.$el.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() { $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter'); }); - this.$element.on('click', '.oe_dropdown_toggle', function(ev) { + this.$el.on('click', '.oe_dropdown_toggle', function(ev) { ev.preventDefault(); var $toggle = $(this); var $menu = $toggle.siblings('.oe_dropdown_menu'); @@ -948,7 +934,7 @@ instance.web.Client = instance.web.Widget.extend({ instance.web.bus.on('click', this, function(ev) { $.fn.tipsy.clear(); if (!$(ev.target).is('input[type=file]')) { - self.$element.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened'); + self.$el.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened'); } }); }, @@ -957,9 +943,9 @@ instance.web.Client = instance.web.Widget.extend({ this.crashmanager = new instance.web.CrashManager(); instance.session.on_rpc_error.add(this.crashmanager.on_rpc_error); self.notification = new instance.web.Notification(this); - self.notification.appendTo(self.$element); + self.notification.appendTo(self.$el); self.loading = new instance.web.Loading(self); - self.loading.appendTo(self.$element); + self.loading.appendTo(self.$el); self.action_manager = new instance.web.ActionManager(self); self.action_manager.appendTo(self.$('.oe_application')); }, @@ -1029,25 +1015,21 @@ instance.web.WebClient = instance.web.Client.extend({ var self = this; self.toggle_bars(true); self.menu = new instance.web.Menu(self); - self.menu.replace(this.$element.find('.oe_menu_placeholder')); + self.menu.replace(this.$el.find('.oe_menu_placeholder')); self.menu.on('menu_click', this, this.on_menu_action); self.user_menu = new instance.web.UserMenu(self); - self.user_menu.replace(this.$element.find('.oe_user_menu_placeholder')); + self.user_menu.replace(this.$el.find('.oe_user_menu_placeholder')); self.user_menu.on_menu_logout.add(this.proxy('on_logout')); self.user_menu.on_action.add(this.proxy('on_menu_action')); self.user_menu.do_update(); self.bind_hashchange(); - if (!self.session.openerp_entreprise) { - var version_label = _t("OpenERP - Unsupported/Community Version"); - self.$element.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">%s</a></span>', version_label)); - } self.set_title(); }, destroy_content: function() { _.each(_.clone(this.getChildren()), function(el) { el.destroy(); }); - this.$element.children().remove(); + this.$el.children().remove(); }, do_reload: function() { var self = this; @@ -1079,7 +1061,7 @@ instance.web.WebClient = instance.web.Client.extend({ var state = $.bbq.getState(true); if (_.isEmpty(state) || state.action == "login") { self.menu.has_been_loaded.then(function() { - var first_menu_id = self.menu.$element.find("a:first").data("menu"); + var first_menu_id = self.menu.$el.find("a:first").data("menu"); if(first_menu_id) { self.menu.menu_click(first_menu_id); } @@ -1134,10 +1116,10 @@ instance.web.WebClient = instance.web.Client.extend({ }, set_content_full_screen: function(fullscreen) { if (fullscreen) { - $(".oe_webclient", this.$element).addClass("oe_content_full_screen"); + $(".oe_webclient", this.$el).addClass("oe_content_full_screen"); $("body").css({'overflow-y':'hidden'}); } else { - $(".oe_webclient", this.$element).removeClass("oe_content_full_screen"); + $(".oe_webclient", this.$el).removeClass("oe_content_full_screen"); $("body").css({'overflow-y':'scroll'}); } } diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 5da12043994..8a28c0a8a4d 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -525,8 +525,8 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { _.each(this.getChildren(), function(el) { el.destroy(); }); - if(this.$element) { - this.$element.remove(); + if(this.$el) { + this.$el.remove(); } instance.web.PropertiesMixin.destroy.call(this); }, @@ -538,7 +538,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { appendTo: function(target) { var self = this; return this.__widgetRenderAndInsert(function(t) { - self.$element.appendTo(t); + self.$el.appendTo(t); }, target); }, /** @@ -549,7 +549,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { prependTo: function(target) { var self = this; return this.__widgetRenderAndInsert(function(t) { - self.$element.prependTo(t); + self.$el.prependTo(t); }, target); }, /** @@ -560,7 +560,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { insertAfter: function(target) { var self = this; return this.__widgetRenderAndInsert(function(t) { - self.$element.insertAfter(t); + self.$el.insertAfter(t); }, target); }, /** @@ -571,7 +571,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { insertBefore: function(target) { var self = this; return this.__widgetRenderAndInsert(function(t) { - self.$element.insertBefore(t); + self.$el.insertBefore(t); }, target); }, /** @@ -581,7 +581,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { */ replace: function(target) { return this.__widgetRenderAndInsert(_.bind(function(t) { - this.$element.replaceAll(t); + this.$el.replaceAll(t); }, this), target); }, __widgetRenderAndInsert: function(insertion, target) { @@ -640,8 +640,8 @@ instance.web.CallbackEnabled = instance.web.Class.extend(instance.web.CallbackEn * // stuff that you want to init before the rendering * }, * start: function() { - * // stuff you want to make after the rendering, `this.$element` holds a correct value - * this.$element.find(".my_button").click(/* an example of event binding * /); + * // stuff you want to make after the rendering, `this.$el` holds a correct value + * this.$el.find(".my_button").click(/* an example of event binding * /); * * // if you have some asynchronous operations, it's a good idea to return * // a promise in start() @@ -718,15 +718,15 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { * @returns {*} this */ replaceElement: function ($el) { - var $oldel = this.$element; + var $oldel = this.$el; this.setElement($el); - if ($oldel && !$oldel.is(this.$element)) { - $oldel.replaceWith(this.$element); + if ($oldel && !$oldel.is(this.$el)) { + $oldel.replaceWith(this.$el); } return this; }, /** - * Re-sets the widget's root element (el/$el/$element). + * Re-sets the widget's root element (el/$el/$el). * * Includes: * * re-delegating events @@ -738,14 +738,14 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { * @return {*} this */ setElement: function (element) { - // NB: completely useless, as WidgetMixin#init creates a $element + // NB: completely useless, as WidgetMixin#init creates a $el // always - if (this.$element) { + if (this.$el) { this.undelegateEvents(); } - this.$element = (element instanceof $) ? element : $(element); - this.el = this.$element[0]; + this.$el = (element instanceof $) ? element : $(element); + this.el = this.$el[0]; this.delegateEvents(); @@ -797,23 +797,23 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { event += '.widget_events'; if (!selector) { - this.$element.on(event, method); + this.$el.on(event, method); } else { - this.$element.on(event, selector, method); + this.$el.on(event, selector, method); } } }, undelegateEvents: function () { - this.$element.off('.widget_events'); + this.$el.off('.widget_events'); }, /** - * Shortcut for ``this.$element.find(selector)`` + * Shortcut for ``this.$el.find(selector)`` * * @param {String} selector CSS selector, rooted in $el * @returns {jQuery} selector match */ $: function(selector) { - return this.$element.find(selector); + return this.$el.find(selector); }, /** * Informs the action manager to do an action. This supposes that diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 229a82a1784..38cf57387d1 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -35,7 +35,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess this.username = false; this.user_context= {}; this.db = false; - this.openerp_entreprise = false; this.module_list = instance._modules.slice(); this.module_loaded = {}; _(this.module_list).each(function (mod) { @@ -78,8 +77,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess db: result.db, username: result.login, uid: result.uid, - user_context: result.context, - openerp_entreprise: result.openerp_entreprise + user_context: result.context }); }); }, @@ -103,8 +101,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess db: result.db, username: result.login, uid: result.uid, - user_context: result.context, - openerp_entreprise: result.openerp_entreprise + user_context: result.context }); if (!_volatile) { self.set_cookie('session_id', self.session_id); @@ -520,57 +517,6 @@ $.async_when = function() { return old_async_when.apply(this, arguments); }; -/** Setup blockui */ -if ($.blockUI) { - $.blockUI.defaults.baseZ = 1100; - $.blockUI.defaults.message = '<div class="oe_blockui_spin_container">'; - $.blockUI.defaults.css.border = '0'; - $.blockUI.defaults.css["background-color"] = ''; -} - -instance.web.Throbber = instance.web.Widget.extend({ - template: "Throbber", - start: function() { - var opts = { - lines: 13, // The number of lines to draw - length: 7, // The length of each line - width: 4, // The line thickness - radius: 10, // The radius of the inner circle - rotate: 0, // The rotation offset - color: '#FFF', // #rgb or #rrggbb - speed: 1, // Rounds per second - trail: 60, // Afterglow percentage - shadow: false, // Whether to render a shadow - hwaccel: false, // Whether to use hardware acceleration - className: 'spinner', // The CSS class to assign to the spinner - zIndex: 2e9, // The z-index (defaults to 2000000000) - top: 'auto', // Top position relative to parent in px - left: 'auto' // Left position relative to parent in px - }; - this.spin = new Spinner(opts).spin(this.$element[0]); - }, - destroy: function() { - if (this.spin) - this.spin.stop(); - this._super(); - }, -}); -instance.web.Throbber.throbbers = []; - -instance.web.blockUI = function() { - var tmp = $.blockUI.apply($, arguments); - var throbber = new instance.web.Throbber(); - instance.web.Throbber.throbbers.push(throbber); - throbber.appendTo($(".oe_blockui_spin_container")); - return tmp; -} -instance.web.unblockUI = function() { - _.each(instance.web.Throbber.throbbers, function(el) { - el.destroy(); - }); - return $.unblockUI.apply($, arguments); -} - /** Setup default session */ instance.session = new instance.web.Session(); @@ -654,6 +600,86 @@ instance.session.on('module_loaded', this, function () { $.timeago.settings.translator = instance.web._t; }); +/** Setup blockui */ +if ($.blockUI) { + $.blockUI.defaults.baseZ = 1100; + $.blockUI.defaults.message = '<div class="oe_blockui_spin_container">'; + $.blockUI.defaults.css.border = '0'; + $.blockUI.defaults.css["background-color"] = ''; +} + +var messages_by_seconds = function() { + return [ + [0, _t("Loading...")], + [30, _t("Still loading...")], + [60, _t("Still loading...<br />Please be patient.")], + [120, _t("Don't leave yet,<br />it's still loading...")], + [300, _t("You may not believe it,<br />but the application is actually loading...")], + [600, _t("You know, sometimes,<br />OpenERP can be a little bit slow,<br />because it's loading...")], + [3600, _t("Maybe you should consider pressing F5...")], + ]; +}; + +instance.web.Throbber = instance.web.Widget.extend({ + template: "Throbber", + start: function() { + var opts = { + lines: 13, // The number of lines to draw + length: 7, // The length of each line + width: 4, // The line thickness + radius: 10, // The radius of the inner circle + rotate: 0, // The rotation offset + color: '#FFF', // #rgb or #rrggbb + speed: 1, // Rounds per second + trail: 60, // Afterglow percentage + shadow: false, // Whether to render a shadow + hwaccel: false, // Whether to use hardware acceleration + className: 'spinner', // The CSS class to assign to the spinner + zIndex: 2e9, // The z-index (defaults to 2000000000) + top: 'auto', // Top position relative to parent in px + left: 'auto' // Left position relative to parent in px + }; + this.spin = new Spinner(opts).spin(this.$el[0]); + this.start_time = new Date().getTime(); + this.act_message(); + }, + act_message: function() { + var self = this; + setTimeout(function() { + if (self.isDestroyed()) + return; + var seconds = (new Date().getTime() - self.start_time) / 1000; + var mes; + _.each(messages_by_seconds(), function(el) { + if (seconds >= el[0]) + mes = el[1]; + }); + self.$(".oe_throbber_message").html(mes); + self.act_message(); + }, 1000); + }, + destroy: function() { + if (this.spin) + this.spin.stop(); + this._super(); + }, +}); +instance.web.Throbber.throbbers = []; + +instance.web.blockUI = function() { + var tmp = $.blockUI.apply($, arguments); + var throbber = new instance.web.Throbber(); + instance.web.Throbber.throbbers.push(throbber); + throbber.appendTo($(".oe_blockui_spin_container")); + return tmp; +} +instance.web.unblockUI = function() { + _.each(instance.web.Throbber.throbbers, function(el) { + el.destroy(); + }); + return $.unblockUI.apply($, arguments); +} + /** * Registry for all the client actions key: tag value: widget */ diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index f8e669e1b4a..29aea6362f7 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -21,31 +21,31 @@ instance.web.DataExport = instance.web.Dialog.extend({ ], close: function(event, ui){ self.close();} }); - self.$element.removeClass('ui-dialog-content ui-widget-content'); - self.$element.find('#add_field').click(function() { + self.$el.removeClass('ui-dialog-content ui-widget-content'); + self.$el.find('#add_field').click(function() { if ($('#field-tree-structure tr.ui-selected')) { - var fld = self.$element.find('#field-tree-structure tr.ui-selected').find('a'); + var fld = self.$el.find('#field-tree-structure tr.ui-selected').find('a'); for (var i = 0; i < fld.length; i++) { var id = $(fld[i]).attr('id').split('-')[1]; var string = $(fld[i]).attr('string'); self.add_field(id, string); } - self.$element.find('#field-tree-structure tr').removeClass('ui-selected'); + self.$el.find('#field-tree-structure tr').removeClass('ui-selected'); } }); - self.$element.find('#remove_field').click(function() { - self.$element.find('#fields_list option:selected').remove(); + self.$el.find('#remove_field').click(function() { + self.$el.find('#fields_list option:selected').remove(); }); - self.$element.find('#remove_all_field').click(function() { - self.$element.find('#fields_list').empty(); + self.$el.find('#remove_all_field').click(function() { + self.$el.find('#fields_list').empty(); }); - this.$element.find('#export_new_list').click(this.on_show_save_list); + this.$el.find('#export_new_list').click(this.on_show_save_list); var got_fields = new $.Deferred(); - this.$element.find('#import_compat').change(function() { - self.$element.find('#fields_list').empty(); - self.$element.find('#field-tree-structure').remove(); - var import_comp = self.$element.find("#import_compat").val(); + this.$el.find('#import_compat').change(function() { + self.$el.find('#fields_list').empty(); + self.$el.find('#field-tree-structure').remove(); + var import_comp = self.$el.find("#import_compat").val(); self.rpc("/web/export/get_fields", { model: self.dataset.model, import_compat: Boolean(import_comp) @@ -61,7 +61,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ this.show_exports_list()); }, do_setup_export_formats: function (formats) { - var $fmts = this.$element.find('#export_format'); + var $fmts = this.$el.find('#export_format'); _(formats).each(function (format) { var opt = new Option(format.label, format.tag); if (format.error) { @@ -76,8 +76,8 @@ instance.web.DataExport = instance.web.Dialog.extend({ }, show_exports_list: function() { var self = this; - if (self.$element.find('#saved_export_list').is(':hidden')) { - self.$element.find('#ExistsExportList').show(); + if (self.$el.find('#saved_export_list').is(':hidden')) { + self.$el.find('#ExistsExportList').show(); return; } return this.exports.read_slice(['name'], { @@ -86,35 +86,35 @@ instance.web.DataExport = instance.web.Dialog.extend({ if (!export_list.length) { return; } - self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list})); - self.$element.find('#saved_export_list').change(function() { - self.$element.find('#fields_list option').remove(); - var export_id = self.$element.find('#saved_export_list option:selected').val(); + self.$el.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list})); + self.$el.find('#saved_export_list').change(function() { + self.$el.find('#fields_list option').remove(); + var export_id = self.$el.find('#saved_export_list option:selected').val(); if (export_id) { self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field); } }); - self.$element.find('#delete_export_list').click(function() { - var select_exp = self.$element.find('#saved_export_list option:selected'); + self.$el.find('#delete_export_list').click(function() { + var select_exp = self.$el.find('#saved_export_list option:selected'); if (select_exp.val()) { self.exports.unlink([parseInt(select_exp.val(), 10)]); select_exp.remove(); - if (self.$element.find('#saved_export_list option').length <= 1) { - self.$element.find('#ExistsExportList').hide(); + if (self.$el.find('#saved_export_list option').length <= 1) { + self.$el.find('#ExistsExportList').hide(); } } }); }); }, do_load_export_field: function(field_list) { - var export_node = this.$element.find("#fields_list"); + var export_node = this.$el.find("#fields_list"); _(field_list).each(function (field) { export_node.append(new Option(field.label, field.name)); }); }, on_show_save_list: function() { var self = this; - var current_node = self.$element.find("#savenewlist"); + var current_node = self.$el.find("#savenewlist"); if (!(current_node.find("label")).length) { current_node.append(QWeb.render('ExportNewList')); current_node.find("#add_export_list").click(function() { @@ -150,14 +150,14 @@ instance.web.DataExport = instance.web.Dialog.extend({ if (!export_list_id.result) { return; } - self.$element.find("#saved_export_list").append( + self.$el.find("#saved_export_list").append( new Option(value, export_list_id.result)); - if (self.$element.find("#saved_export_list").is(":hidden")) { + if (self.$el.find("#saved_export_list").is(":hidden")) { self.show_exports_list(); } }); this.on_show_save_list(); - this.$element.find("#fields_list option").remove(); + this.$el.find("#fields_list option").remove(); }, on_click: function(id, record) { var self = this; @@ -173,7 +173,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ } if (!record.loaded) { - var import_comp = self.$element.find("#import_compat").val(); + var import_comp = self.$el.find("#import_compat").val(); self.rpc("/web/export/get_fields", { model: model, prefix: prefix, @@ -191,44 +191,44 @@ instance.web.DataExport = instance.web.Dialog.extend({ }, on_show_data: function(result, after) { var self = this; - var imp_cmpt = Boolean(self.$element.find("#import_compat").val()); + var imp_cmpt = Boolean(self.$el.find("#import_compat").val()); if (after) { - var current_tr = self.$element.find("tr[id='treerow-" + after + "']"); + var current_tr = self.$el.find("tr[id='treerow-" + after + "']"); current_tr.addClass('open'); current_tr.find('img').attr('src','/web/static/src/img/collapse.gif'); current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result})); } else { - self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + self.$el.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } _.each(result, function(record) { self.records[record.id] = record.value; if (record.required) { - var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column'); + var required_fld = self.$el.find("tr[id='treerow-" + record.id + "']").find('#tree-column'); required_fld.addClass("oe_export_requiredfield"); } - self.$element.find("img[id='parentimg-" + record.id +"']").click(function() { + self.$el.find("img[id='parentimg-" + record.id +"']").click(function() { self.on_click(this.id, record); }); - self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) { + self.$el.find("tr[id='treerow-" + record.id + "']").click(function(e) { if (e.shiftKey) { var frst_click, scnd_click = ''; if (self.row_index == 0) { self.row_index = this.rowIndex; - frst_click = self.$element.find("tr[id^='treerow-']")[self.row_index-1]; + frst_click = self.$el.find("tr[id^='treerow-']")[self.row_index-1]; $(frst_click).addClass("ui-selected"); } else { if (this.rowIndex >=self.row_index) { for (var i = (self.row_index-1); i < this.rowIndex; i++) { - scnd_click = self.$element.find("tr[id^='treerow-']")[i]; + scnd_click = self.$el.find("tr[id^='treerow-']")[i]; if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) { $(scnd_click).addClass("ui-selected"); } } } else { for (var i = (self.row_index-1); i >= (this.rowIndex-1); i--) { - scnd_click = self.$element.find("tr[id^='treerow-']")[i]; + scnd_click = self.$el.find("tr[id^='treerow-']")[i]; if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) { $(scnd_click).addClass("ui-selected"); } @@ -238,10 +238,10 @@ instance.web.DataExport = instance.web.Dialog.extend({ } self.row_index = this.rowIndex; - self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function() { + self.$el.find("tr[id='treerow-" + record.id + "']").keyup(function() { self.row_index = 0; }); - var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column'); + var o2m_selection = self.$el.find("tr[id='treerow-" + record.id + "']").find('#tree-column'); if ($(o2m_selection).hasClass("oe_export_readonlyfield")) { return false; } @@ -252,14 +252,14 @@ instance.web.DataExport = instance.web.Dialog.extend({ $(this).addClass('ui-selected').find('a').focus(); } } else if (!e.shiftKey) { - self.$element.find("tr.ui-selected") + self.$el.find("tr.ui-selected") .removeClass("ui-selected").find('a').blur(); $(this).addClass("ui-selected").find('a').focus(); } return false; }); - self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function(e) { + self.$el.find("tr[id='treerow-" + record.id + "']").keydown(function(e) { var keyCode = e.keyCode || e.which; var arrow = {left: 37, up: 38, right: 39, down: 40 }; switch (keyCode) { @@ -297,19 +297,19 @@ instance.web.DataExport = instance.web.Dialog.extend({ break; } }); - self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function() { - var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + self.$el.find("tr[id='treerow-" + record.id + "']").dblclick(function() { + var $o2m_selection = self.$el.find("tr[id^='treerow-" + record.id + "']").find('#tree-column'); if (!$o2m_selection.hasClass("oe_export_readonlyfield")) { self.add_field(record.id, $(this).find("a").attr("string")); } }); }); - self.$element.find('#fields_list').mouseover(function(event) { + self.$el.find('#fields_list').mouseover(function(event) { if (event.relatedTarget) { if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']) { var field_id = event.relatedTarget.attributes["id"]["value"]; if (field_id && field_id.split("-")[0] === 'export') { - if (!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")) { + if (!self.$el.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")) { self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); } } @@ -319,7 +319,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ }, showcontent: function(id) { // show & hide the contents - var $this = this.$element.find("tr[id='treerow-" + id + "']"); + var $this = this.$el.find("tr[id='treerow-" + id + "']"); var is_open = $this.hasClass('open'); $this.toggleClass('open'); @@ -329,7 +329,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ } else { first_child.attr('src', '/web/static/src/img/collapse.gif'); } - var child_field = this.$element.find("tr[id^='treerow-" + id +"/']"); + var child_field = this.$el.find("tr[id^='treerow-" + id +"/']"); var child_len = (id.split("/")).length + 1; for (var i = 0; i < child_field.length; i++) { var $child = $(child_field[i]); @@ -345,15 +345,15 @@ instance.web.DataExport = instance.web.Dialog.extend({ } }, add_field: function(field_id, string) { - var field_list = this.$element.find('#fields_list'); - if (this.$element.find("#fields_list option[value='" + field_id + "']") - && !this.$element.find("#fields_list option[value='" + field_id + "']").length) { + var field_list = this.$el.find('#fields_list'); + if (this.$el.find("#fields_list option[value='" + field_id + "']") + && !this.$el.find("#fields_list option[value='" + field_id + "']").length) { field_list.append(new Option(string, field_id)); } }, get_fields: function() { var export_field = []; - this.$element.find("#fields_list option").each(function() { + this.$el.find("#fields_list option").each(function() { export_field.push($(this).val()); }); if (!export_field.length) { @@ -363,7 +363,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ }, on_click_export_data: function() { var self = this; - var exported_fields = this.$element.find('#fields_list option').map(function () { + var exported_fields = this.$el.find('#fields_list option').map(function () { // DOM property is textContent, but IE8 only knows innerText return {name: self.records[this.value] || this.value, label: this.textContent || this.innerText}; @@ -375,7 +375,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ } exported_fields.unshift({name: 'id', label: 'External ID'}); - var export_format = this.$element.find("#export_format").val(); + var export_format = this.$el.find("#export_format").val(); instance.web.blockUI(); this.session.get_file({ url: '/web/export/' + export_format, @@ -385,13 +385,13 @@ instance.web.DataExport = instance.web.Dialog.extend({ ids: this.dataset.ids, domain: this.dataset.domain, import_compat: Boolean( - this.$element.find("#import_compat").val()) + this.$el.find("#import_compat").val()) })}, complete: instance.web.unblockUI }); }, close: function() { - this.$element.remove(); + this.$el.remove(); this._super(); } }); diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index 620878569ce..3c677b0ec26 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -75,9 +75,9 @@ instance.web.DataImport = instance.web.Dialog.extend({ } }); this.toggle_import_button(false); - this.$element.find('#csvfile').change(this.on_autodetect_data); - this.$element.find('fieldset').change(this.on_autodetect_data); - this.$element.delegate('fieldset legend', 'click', function() { + this.$el.find('#csvfile').change(this.on_autodetect_data); + this.$el.find('fieldset').change(this.on_autodetect_data); + this.$el.delegate('fieldset legend', 'click', function() { $(this).parent().toggleClass('oe_closed'); }); this.ready.push(new instance.web.DataSet(this, this.model).call( @@ -156,19 +156,19 @@ instance.web.DataImport = instance.web.Dialog.extend({ }); }, toggle_import_button: function (newstate) { - instance.web.dialog(this.$element, 'widget') + instance.web.dialog(this.$el, 'widget') .find('.oe_import_dialog_button') .button('option', 'disabled', !newstate); }, do_import: function() { - if(!this.$element.find('#csvfile').val()) { return; } - var lines_to_skip = parseInt(this.$element.find('#csv_skip').val(), 10); - var with_headers = this.$element.find('#file_has_headers').prop('checked'); + if(!this.$el.find('#csvfile').val()) { return; } + var lines_to_skip = parseInt(this.$el.find('#csv_skip').val(), 10); + var with_headers = this.$el.find('#file_has_headers').prop('checked'); if (!lines_to_skip && with_headers) { lines_to_skip = 1; } var indices = [], fields = []; - this.$element.find(".sel_fields").each(function(index, element) { + this.$el.find(".sel_fields").each(function(index, element) { var val = element.value; if (!val) { return; @@ -177,7 +177,7 @@ instance.web.DataImport = instance.web.Dialog.extend({ fields.push(val); }); - jsonp(this.$element.find('#import_data'), { + jsonp(this.$el.find('#import_data'), { url: '/web/import/import_data', data: { model: this.model, @@ -190,19 +190,19 @@ instance.web.DataImport = instance.web.Dialog.extend({ }, this.on_import_results); }, on_autodetect_data: function() { - if(!this.$element.find('#csvfile').val()) { return; } - jsonp(this.$element.find('#import_data'), { + if(!this.$el.find('#csvfile').val()) { return; } + jsonp(this.$el.find('#import_data'), { url: '/web/import/detect_data' }, this.on_import_results); }, on_import_results: function(results) { - this.$element.find('#result').empty(); - var headers, result_node = this.$element.find("#result"); + this.$el.find('#result').empty(); + var headers, result_node = this.$el.find("#result"); if (results['error']) { result_node.append(QWeb.render('ImportView.error', { 'error': results['error']})); - this.$element.find('fieldset').removeClass('oe_closed'); + this.$el.find('fieldset').removeClass('oe_closed'); return; } if (results['success']) { @@ -214,8 +214,8 @@ instance.web.DataImport = instance.web.Dialog.extend({ } if (results['records']) { - var lines_to_skip = parseInt(this.$element.find('#csv_skip').val(), 10), - with_headers = this.$element.find('#file_has_headers').prop('checked'); + var lines_to_skip = parseInt(this.$el.find('#csv_skip').val(), 10), + with_headers = this.$el.find('#file_has_headers').prop('checked'); headers = with_headers ? results.records[0] : null; result_node.append(QWeb.render('ImportView.result', { @@ -224,17 +224,17 @@ instance.web.DataImport = instance.web.Dialog.extend({ : with_headers ? results.records.slice(1) : results.records })); - this.$element.find('fieldset').addClass('oe_closed'); + this.$el.find('fieldset').addClass('oe_closed'); } - this.$element.find('form').removeClass('oe_import_no_result'); + this.$el.find('form').removeClass('oe_import_no_result'); - this.$element.delegate('.oe_m2o_drop_down_button', 'click', function () { + this.$el.delegate('.oe_m2o_drop_down_button', 'click', function () { $(this).prev('input').focus(); }); var self = this; this.ready.then(function () { - var $fields = self.$element.find('.sel_fields').bind('blur', function () { + var $fields = self.$el.find('.sel_fields').bind('blur', function () { if (this.value && !_(self.all_fields).contains(this.value)) { this.value = ''; } @@ -315,9 +315,9 @@ instance.web.DataImport = instance.web.Dialog.extend({ find_duplicate_fields: function() { // Maps values to DOM nodes, in order to discover duplicates var values = {}, duplicates = {}; - this.$element.find(".sel_fields").each(function(index, element) { + this.$el.find(".sel_fields").each(function(index, element) { var value = element.value; - var $element = $(element).removeClass('duplicate_fld'); + var $el = $(element).removeClass('duplicate_fld'); if (!value) { return; } if (!(value in values)) { @@ -329,13 +329,13 @@ instance.web.DataImport = instance.web.Dialog.extend({ } else { duplicates[value] = [same_valued_field, element]; } - $element.add(same_valued_field).addClass('duplicate_fld'); + $el.add(same_valued_field).addClass('duplicate_fld'); } }); return duplicates; }, on_check_field_values: function () { - this.$element.find("#message, #msg").remove(); + this.$el.find("#message, #msg").remove(); var required_valid = this.check_required(); @@ -343,7 +343,7 @@ instance.web.DataImport = instance.web.Dialog.extend({ if (_.isEmpty(duplicates)) { this.toggle_import_button(required_valid); } else { - var $err = $('<div id="msg" style="color: red;">'+_t("Destination fields should only be selected once, some fields are selected more than once:")+'</div>').insertBefore(this.$element.find('#result')); + var $err = $('<div id="msg" style="color: red;">'+_t("Destination fields should only be selected once, some fields are selected more than once:")+'</div>').insertBefore(this.$el.find('#result')); var $dupes = $('<dl>').appendTo($err); _(duplicates).each(function(elements, value) { $('<dt>').text(value).appendTo($dupes); @@ -372,7 +372,7 @@ instance.web.DataImport = instance.web.Dialog.extend({ return f.id; }; - var selected_fields = _(this.$element.find('.sel_fields').get()).chain() + var selected_fields = _(this.$el.find('.sel_fields').get()).chain() .pluck('value') .compact() .map(resolve_field_id) @@ -380,13 +380,13 @@ instance.web.DataImport = instance.web.Dialog.extend({ var missing_fields = _.difference(this.required_fields, selected_fields); if (missing_fields.length) { - this.$element.find("#result").before('<div id="message" style="color:red">' + _t("*Required Fields are not selected :") + missing_fields + '.</div>'); + this.$el.find("#result").before('<div id="message" style="color:red">' + _t("*Required Fields are not selected :") + missing_fields + '.</div>'); return false; } return true; }, destroy: function() { - this.$element.remove(); + this.$el.remove(); this._super(); } }); diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index a7625631aa5..8e9a31922b8 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -126,21 +126,21 @@ my.InputView = instance.web.Widget.extend({ template: 'SearchView.InputView', start: function () { var p = this._super.apply(this, arguments); - this.$element.on('focus', this.proxy('onFocus')); - this.$element.on('blur', this.proxy('onBlur')); - this.$element.on('keydown', this.proxy('onKeydown')); + this.$el.on('focus', this.proxy('onFocus')); + this.$el.on('blur', this.proxy('onBlur')); + this.$el.on('keydown', this.proxy('onKeydown')); return p; }, onFocus: function () { this.trigger('focused', this); }, onBlur: function () { - this.$element.text(''); + this.$el.text(''); this.trigger('blurred', this); }, getSelection: function () { // get Text node - var root = this.$element[0].childNodes[0]; + var root = this.$el[0].childNodes[0]; if (!root || !root.textContent) { // if input does not have a child node, or the child node is an // empty string, then the selection can only be (0, 0) @@ -202,7 +202,7 @@ my.InputView = instance.web.Widget.extend({ break; case $.ui.keyCode.RIGHT: sel = this.getSelection(); - var len = this.$element.text().length; + var len = this.$el.text().length; if (sel.start !== len || sel.start !== sel.end) { e.stopPropagation(); } @@ -223,17 +223,17 @@ my.FacetView = instance.web.Widget.extend({ }, start: function () { var self = this; - this.$element.on('focus', function () { self.trigger('focused', self); }); - this.$element.on('blur', function () { self.trigger('blurred', self); }); - this.$element.on('click', function (e) { + this.$el.on('focus', function () { self.trigger('focused', self); }); + this.$el.on('blur', function () { self.trigger('blurred', self); }); + this.$el.on('click', function (e) { if ($(e.target).is('.oe_facet_remove')) { self.model.destroy(); return false; } - self.$element.focus(); + self.$el.focus(); e.stopPropagation(); }); - this.$element.on('keydown', function (e) { + this.$el.on('keydown', function (e) { var keys = $.ui.keyCode; switch (e.which) { case keys.BACKSPACE: @@ -242,7 +242,7 @@ my.FacetView = instance.web.Widget.extend({ return false; } }); - var $e = self.$element.find('> span:last-child'); + var $e = self.$el.find('> span:last-child'); var q = $.when(this._super()); return q.pipe(function () { var values = self.model.values.map(function (value) { @@ -253,7 +253,7 @@ my.FacetView = instance.web.Widget.extend({ }); }, model_changed: function () { - this.$element.text(this.$element.text() + '*'); + this.$el.text(this.$el.text() + '*'); } }); my.FacetValueView = instance.web.Widget.extend({ @@ -268,7 +268,7 @@ my.FacetValueView = instance.web.Widget.extend({ this._super(); }, model_changed: function () { - this.$element.text(this.$element.text() + '*'); + this.$el.text(this.$el.text() + '*'); } }); @@ -313,7 +313,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea .on('add change reset remove', this.proxy('renderFacets')); if (this.hidden) { - this.$element.hide(); + this.$el.hide(); } if (this.headless) { this.ready.resolve(); @@ -331,12 +331,12 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } // Launch a search on clicking the oe_searchview_search button - this.$element.on('click', 'button.oe_searchview_search', function (e) { + this.$el.on('click', 'button.oe_searchview_search', function (e) { e.stopImmediatePropagation(); self.do_search(); }); - this.$element.on('keydown', + this.$el.on('keydown', '.oe_searchview_input, .oe_searchview_facet', function (e) { switch(e.which) { case $.ui.keyCode.LEFT: @@ -350,31 +350,31 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } }); - this.$element.on('click', '.oe_searchview_clear', function (e) { + this.$el.on('click', '.oe_searchview_clear', function (e) { e.stopImmediatePropagation(); self.query.reset(); }); - this.$element.on('click', '.oe_searchview_unfold_drawer', function (e) { + this.$el.on('click', '.oe_searchview_unfold_drawer', function (e) { e.stopImmediatePropagation(); - self.$element.toggleClass('oe_searchview_open_drawer'); + self.$el.toggleClass('oe_searchview_open_drawer'); }); instance.web.bus.on('click', this, function(ev) { if ($(ev.target).parents('.oe_searchview').length === 0) { - self.$element.removeClass('oe_searchview_open_drawer'); + self.$el.removeClass('oe_searchview_open_drawer'); } }); // Focus last input if the view itself is clicked (empty section of // facets element) - this.$element.on('click', function (e) { - if (e.target === self.$element.find('.oe_searchview_facets')[0]) { - self.$element.find('.oe_searchview_input:last').focus(); + this.$el.on('click', function (e) { + if (e.target === self.$el.find('.oe_searchview_facets')[0]) { + self.$el.find('.oe_searchview_input:last').focus(); } }); // when the completion list opens/refreshes, automatically select the // first completion item so if the user just hits [RETURN] or [TAB] it // automatically selects it - this.$element.on('autocompleteopen', function () { - var menu = self.$element.data('autocomplete').menu; + this.$el.on('autocompleteopen', function () { + var menu = self.$el.data('autocomplete').menu; menu.activate( $.Event({ type: "mouseenter" }), menu.element.children().first()); @@ -383,15 +383,15 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea return $.when(p, this.ready); }, show: function () { - this.$element.show(); + this.$el.show(); }, hide: function () { - this.$element.hide(); + this.$el.hide(); }, subviewForRoot: function (subview_root) { return _(this.input_subviews).detect(function (subview) { - return subview.$element[0] === subview_root; + return subview.$el[0] === subview_root; }); }, siblingSubview: function (subview, direction, wrap_around) { @@ -406,12 +406,12 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea focusPreceding: function (subview_root) { return this.siblingSubview( this.subviewForRoot(subview_root), -1, true) - .$element.focus(); + .$el.focus(); }, focusFollowing: function (subview_root) { return this.siblingSubview( this.subviewForRoot(subview_root), +1, true) - .$element.focus(); + .$el.focus(); }, /** @@ -430,19 +430,19 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea // autocomplete only correctly handles being initialized on the actual // editable element (and only an element with a @value in 1.8 e.g. - // input or textarea), cheat by setting val() on $element - this.$element.on('keydown', function () { + // input or textarea), cheat by setting val() on $el + this.$el.on('keydown', function () { // keydown is triggered *before* the element's value is set, so // delay this. Pray that setTimeout are executed in FIFO (if they // have the same delay) as autocomplete uses the exact same trick. // FIXME: brittle as fuck setTimeout(function () { - self.$element.val(self.currentInputValue()); + self.$el.val(self.currentInputValue()); }, 0); }); - this.$element.autocomplete({ + this.$el.autocomplete({ source: this.proxy('complete_global_search'), select: this.proxy('select_completion'), focus: function (e) { e.preventDefault(); }, @@ -479,7 +479,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea * div[contenteditable].oe_searchview_input) */ currentInputValue: function () { - return this.$element.find('div.oe_searchview_input:focus').text(); + return this.$el.find('div.oe_searchview_input:focus').text(); }, /** * Provide auto-completion result for req.term (an array to `resp`) @@ -509,22 +509,22 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea var input_index = _(this.input_subviews).indexOf( this.subviewForRoot( - this.$element.find('div.oe_searchview_input:focus')[0])); + this.$el.find('div.oe_searchview_input:focus')[0])); this.query.add(ui.item.facet, {at: input_index / 2}); }, childFocused: function () { - this.$element.addClass('oe_focused'); + this.$el.addClass('oe_focused'); }, childBlurred: function () { - var val = this.$element.val(); - this.$element.val(''); - var complete = this.$element.data('autocomplete'); + var val = this.$el.val(); + this.$el.val(''); + var complete = this.$el.data('autocomplete'); if ((val && complete.term === undefined) || complete.previous !== undefined) { throw new Error("new jquery.ui version altering implementation" + " details relied on"); } delete complete.term; - this.$element.removeClass('oe_focused') + this.$el.removeClass('oe_focused') .trigger('blur'); }, /** @@ -538,7 +538,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea // _2: undefined if event=change, otherwise model var self = this; var started = []; - var $e = this.$element.find('div.oe_searchview_facets'); + var $e = this.$el.find('div.oe_searchview_facets'); _.invoke(this.input_subviews, 'destroy'); this.input_subviews = []; @@ -569,7 +569,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea input_to_focus = self.input_subviews[(options.at + 1) * 2]; } - input_to_focus.$element.focus(); + input_to_focus.$el.focus(); }); }, @@ -664,7 +664,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea // build drawer var drawer_started = $.when.apply( null, _(this.select_for_drawer()).invoke( - 'appendTo', this.$element.find('.oe_searchview_drawer'))); + 'appendTo', this.$el.find('.oe_searchview_drawer'))); // load defaults var defaults_fetched = $.when.apply(null, _(this.inputs).invoke( @@ -680,7 +680,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea */ on_filters_management: function(e) { var self = this; - var select = this.$element.find(".oe_search-view-filters-management"); + var select = this.$el.find(".oe_search-view-filters-management"); var val = select.val(); switch(val) { case 'advanced_filter': @@ -989,7 +989,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in this.view.query.on('add remove change reset', this.proxy('search_change')); }, start: function () { - this.$element.on('click', 'li', this.proxy('toggle_filter')); + this.$el.on('click', 'li', this.proxy('toggle_filter')); return $.when(null); }, /** @@ -998,7 +998,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in */ search_change: function () { var self = this; - var $filters = this.$element.find('> li').removeClass('oe_selected'); + var $filters = this.$el.find('> li').removeClass('oe_selected'); var facet = this.view.query.find(_.bind(this.match_facet, this)); if (!facet) { return; } facet.values.each(function (v) { @@ -1299,17 +1299,17 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins }); instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{ value_from: function () { - if (!this.$element.val()) { + if (!this.$el.val()) { return null; } - var val = this.parse(this.$element.val()), - check = Number(this.$element.val()); + var val = this.parse(this.$el.val()), + check = Number(this.$el.val()); if (isNaN(val) || val !== check) { - this.$element.addClass('error'); + this.$el.addClass('error'); throw new instance.web.search.Invalid( - this.attrs.name, this.$element.val(), this.error_message); + this.attrs.name, this.$el.val(), this.error_message); } - this.$element.removeClass('error'); + this.$el.removeClass('error'); return val; } }); @@ -1542,9 +1542,9 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ self.clear_selection(); }) .on('reset', this.proxy('clear_selection')); - this.$element.on('submit', 'form', this.proxy('save_current')); - this.$element.on('click', 'h4', function () { - self.$element.toggleClass('oe_opened'); + this.$el.on('submit', 'form', this.proxy('save_current')); + this.$el.on('click', 'h4', function () { + self.$el.toggleClass('oe_opened'); }); // FIXME: local eval of domain and context to get rid of special endpoint return this.rpc('/web/searchview/get_filters', { @@ -1552,7 +1552,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ }).pipe(this.proxy('set_filters')); }, clear_selection: function () { - this.$element.find('li.oe_selected').removeClass('oe_selected'); + this.$el.find('li.oe_selected').removeClass('oe_selected'); }, append_filter: function (filter) { var self = this; @@ -1564,7 +1564,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ } else { var id = filter.id; $filter = this.filters[key] = $('<li></li>') - .appendTo(this.$element.find('.oe_searchview_custom_list')) + .appendTo(this.$el.find('.oe_searchview_custom_list')) .addClass(filter.user_id ? 'oe_searchview_custom_private' : 'oe_searchview_custom_public') .text(filter.name); @@ -1599,8 +1599,8 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ }, save_current: function () { var self = this; - var $name = this.$element.find('input:first'); - var private_filter = !this.$element.find('input:last').prop('checked'); + var $name = this.$el.find('input:first'); + var private_filter = !this.$el.find('input:last').prop('checked'); var search = this.view.build_search_data(); this.rpc('/web/session/eval_domain_and_context', { @@ -1622,7 +1622,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ return self.model.call('create_or_replace', [filter]).then(function (id) { filter.id = id; self.append_filter(filter); - self.$element + self.$el .removeClass('oe_opened') .find('form')[0].reset(); }); @@ -1667,8 +1667,8 @@ instance.web.search.Filters = instance.web.search.Input.extend({ } return $.when( - this.render_column(col1, $('<div>').appendTo(this.$element)), - this.render_column(col2, $('<div>').appendTo(this.$element))); + this.render_column(col1, $('<div>').appendTo(this.$el)), + this.render_column(col2, $('<div>').appendTo(this.$el))); }, render_column: function (column, $el) { return $.when.apply(null, _(column).map(function (group) { @@ -1684,10 +1684,10 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ _in_drawer: true, start: function () { var self = this; - this.$element + this.$el .on('keypress keydown keyup', function (e) { e.stopPropagation(); }) .on('click', 'h4', function () { - self.$element.toggleClass('oe_opened'); + self.$el.toggleClass('oe_opened'); }).on('click', 'button.oe_add_condition', function () { self.append_proposition(); }).on('submit', 'form', function (e) { @@ -1706,7 +1706,7 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ }, append_proposition: function () { return (new instance.web.search.ExtendedSearchProposition(this, this.fields)) - .appendTo(this.$element.find('ul')); + .appendTo(this.$el.find('ul')); }, commit_search: function () { var self = this; @@ -1733,7 +1733,7 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ // add new empty proposition this.append_proposition(); // TODO: API on searchview - this.view.$element.removeClass('oe_searchview_open_drawer'); + this.view.$el.removeClass('oe_searchview_open_drawer'); } }); @@ -1757,16 +1757,16 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ }, start: function () { var _this = this; - this.$element.find(".searchview_extended_prop_field").change(function() { + this.$el.find(".searchview_extended_prop_field").change(function() { _this.changed(); }); - this.$element.find('.searchview_extended_delete_prop').click(function () { + this.$el.find('.searchview_extended_delete_prop').click(function () { _this.destroy(); }); this.changed(); }, changed: function() { - var nval = this.$element.find(".searchview_extended_prop_field").val(); + var nval = this.$el.find(".searchview_extended_prop_field").val(); if(this.attrs.selected == null || nval != this.attrs.selected.name) { this.select_field(_.detect(this.fields, function(x) {return x.name == nval;})); } @@ -1781,7 +1781,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ if(this.attrs.selected != null) { this.value.destroy(); this.value = null; - this.$element.find('.searchview_extended_prop_op').html(''); + this.$el.find('.searchview_extended_prop_op').html(''); } this.attrs.selected = field; if(field == null) { @@ -1797,9 +1797,9 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ _.each(this.value.operators, function(operator) { $('<option>', {value: operator.value}) .text(String(operator.text)) - .appendTo(self.$element.find('.searchview_extended_prop_op')); + .appendTo(self.$el.find('.searchview_extended_prop_op')); }); - var $value_loc = this.$element.find('.searchview_extended_prop_value').empty(); + var $value_loc = this.$el.find('.searchview_extended_prop_value').empty(); this.value.appendTo($value_loc); }, @@ -1807,7 +1807,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ if ( this.attrs.selected == null) return null; var field = this.attrs.selected; - var op = this.$element.find('.searchview_extended_prop_op')[0]; + var op = this.$el.find('.searchview_extended_prop_op')[0]; var operator = op.options[op.selectedIndex]; return { label: _.str.sprintf(_t('%(field)s %(operator)s "%(value)s"'), { @@ -1851,7 +1851,7 @@ instance.web.search.ExtendedSearchProposition.Char = instance.web.search.Extende {value: "!=", text: _lt("is not equal to")} ], get_value: function() { - return this.$element.val(); + return this.$el.val(); } }); instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.ExtendedSearchProposition.Field.extend({ @@ -1875,7 +1875,7 @@ instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.Ext start: function() { var ready = this._super(); this.datewidget = new (this.widget())(this); - this.datewidget.appendTo(this.$element); + this.datewidget.appendTo(this.$el); return ready; } }); @@ -1893,11 +1893,11 @@ instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.Exte {value: "<=", text: _lt("less or equal than")} ], toString: function () { - return this.$element.val(); + return this.$el.val(); }, get_value: function() { try { - return instance.web.parse_value(this.$element.val(), {'widget': 'integer'}); + return instance.web.parse_value(this.$el.val(), {'widget': 'integer'}); } catch (e) { return ""; } @@ -1917,11 +1917,11 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend {value: "<=", text: _lt("less or equal than")} ], toString: function () { - return this.$element.val(); + return this.$el.val(); }, get_value: function() { try { - return instance.web.parse_value(this.$element.val(), {'widget': 'float'}); + return instance.web.parse_value(this.$el.val(), {'widget': 'float'}); } catch (e) { return ""; } @@ -1934,12 +1934,12 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex {value: "!=", text: _lt("is not")} ], toString: function () { - var select = this.$element[0]; + var select = this.$el[0]; var option = select.options[select.selectedIndex]; return option.label || option.text; }, get_value: function() { - return this.$element.val(); + return this.$el.val(); } }); instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({ diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js index 314a12c91c6..8e1317ba2b0 100644 --- a/addons/web/static/src/js/test_support.js +++ b/addons/web/static/src/js/test_support.js @@ -12,7 +12,6 @@ openerp.test_support = { username: false, user_context: {}, db: false, - openerp_entreprise: false, // this.module_list = openerp._modules.slice(); // this.module_loaded = {}; // _(this.module_list).each(function (mod) { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3efee9a140f..6abc3c470d6 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -102,8 +102,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM w.off('focused blurred'); w.destroy(); }); - if (this.$element) { - this.$element.off('.formBlur'); + if (this.$el) { + this.$el.off('.formBlur'); } this._super(); }, @@ -122,11 +122,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.rendering_engine.set_tags_registry(this.tags_registry); if (!this.extract_qweb_template(data)) { this.rendering_engine.set_fields_view(data); - var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container'); + var $dest = this.$el.hasClass("oe_form_container") ? this.$el : this.$el.find('.oe_form_container'); this.rendering_engine.render_to($dest); } - this.$element.on('mousedown.formBlur', function () { + this.$el.on('mousedown.formBlur', function () { self.__clicked_inside = true; }); @@ -134,14 +134,14 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.options.$buttons) { this.$buttons.appendTo(this.options.$buttons); } else { - this.$element.find('.oe_form_buttons').replaceWith(this.$buttons); + this.$el.find('.oe_form_buttons').replaceWith(this.$buttons); } this.$buttons.on('click','.oe_form_button_create',this.on_button_create); this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit); this.$buttons.on('click','.oe_form_button_save',this.on_button_save); this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel); - this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar'); + this.$sidebar = this.options.$sidebar || this.$el.find('.oe_form_sidebar'); if (!this.sidebar && this.options.$sidebar) { this.sidebar = new instance.web.Sidebar(this); this.sidebar.appendTo(this.$sidebar); @@ -158,7 +158,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.has_been_loaded.resolve(); // Add bounce effect on button 'Edit' when click on readonly page view. - this.$element.find(".oe_form_field,label").on('click', function (e) { + this.$el.find(".oe_form_field,label").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); $button.effect('bounce', {distance: 18, times: 5}, 150) @@ -215,7 +215,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.default_focus_field = null; this.default_focus_button = null; this.translatable_fields = []; - this.$element.find('.oe_form_container').empty(); + this.$el.find('.oe_form_container').empty(); }, widgetFocused: function() { @@ -263,7 +263,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var self = this; options = options || {}; if (this.sidebar) { - this.sidebar.$element.show(); + this.sidebar.$el.show(); } if (this.$buttons) { this.$buttons.show(); @@ -271,11 +271,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.$pager) { this.$pager.show(); } - this.$element.show().css({ + this.$el.show().css({ opacity: '0', filter: 'alpha(opacity = 0)' }); - this.$element.add(this.$buttons).removeClass('oe_form_dirty'); + this.$el.add(this.$buttons).removeClass('oe_form_dirty'); var shown = this.has_been_loaded; if (options.reload !== false) { @@ -293,7 +293,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } return shown.pipe(function() { self._actualize_mode(options.mode || self.options.initial_mode); - self.$element.css({ + self.$el.css({ opacity: '1', filter: 'alpha(opacity = 100)' }); @@ -301,7 +301,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, do_hide: function () { if (this.sidebar) { - this.sidebar.$element.hide(); + this.sidebar.$el.hide(); } if (this.$buttons) { this.$buttons.hide(); @@ -325,7 +325,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.qweb) { this.kill_current_form(); this.rendering_engine.set_fields_view(this.get_fvg_from_qweb(record)); - var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container'); + var $dest = this.$el.hasClass("oe_form_container") ? this.$el : this.$el.find('.oe_form_container'); this.rendering_engine.render_to($dest); } @@ -357,7 +357,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } else { self.do_push_state({}); } - self.$element.add(self.$buttons).removeClass('oe_form_dirty'); + self.$el.add(self.$buttons).removeClass('oe_form_dirty'); self.autofocus(); }); }, @@ -379,7 +379,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.trigger("view_content_has_changed"); }, do_notify_change: function() { - this.$element.add(this.$buttons).addClass('oe_form_dirty'); + this.$el.add(this.$buttons).addClass('oe_form_dirty'); }, on_pager_action: function(action) { if (this.can_be_discarded()) { @@ -410,7 +410,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.options.$pager) { this.$pager.appendTo(this.options.$pager); } else { - this.$element.find('.oe_form_pager').replaceWith(this.$pager); + this.$el.find('.oe_form_pager').replaceWith(this.$pager); } this.$pager.on('click','a[data-pager-action]',function() { var action = $(this).data('pager-action'); @@ -653,7 +653,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM check_actual_mode: function(source, options) { var self = this; if(this.get("actual_mode") === "view") { - self.$element.removeClass('oe_form_editable').addClass('oe_form_readonly'); + self.$el.removeClass('oe_form_editable').addClass('oe_form_readonly'); self.$buttons.find('.oe_form_buttons_edit').hide(); self.$buttons.find('.oe_form_buttons_view').show(); self.$sidebar.show(); @@ -661,7 +661,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM field.set({"force_readonly": true}); }); } else { - self.$element.removeClass('oe_form_readonly').addClass('oe_form_editable'); + self.$el.removeClass('oe_form_readonly').addClass('oe_form_editable'); self.$buttons.find('.oe_form_buttons_edit').show(); self.$buttons.find('.oe_form_buttons_view').hide(); self.$sidebar.hide(); @@ -689,7 +689,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, on_button_save: function() { var self = this; - return this.do_save().then(function(result) { + return this.do_save().then(function(result) { self.to_view_mode(); }); }, @@ -752,17 +752,18 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return def.promise(); }, can_be_discarded: function() { - return !this.$element.is('.oe_form_dirty') || confirm(_t("Warning, the record has been modified, your changes will be discarded.")); + return !this.$el.is('.oe_form_dirty') || confirm(_t("Warning, the record has been modified, your changes will be discarded.")); }, /** * Triggers saving the form's record. Chooses between creating a new * record or saving an existing one depending on whether the record * already has an id property. * - * @param {Function} [success] callback on save success - * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new record, should that record be inserted at the start of the dataset (by default, records are added at the end) + * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new + * record, should that record be inserted at the start of the dataset (by + * default, records are added at the end) */ - do_save: function(success, prepend_on_create) { + do_save: function(prepend_on_create) { var self = this; return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() { try { @@ -797,21 +798,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM self.set({'display_invalid_fields': false}); var save_deferral; if (!self.datarecord.id) { - // console.log("FormView(", self, ") : About to create", values); + // Creation save save_deferral = self.dataset.create(values).pipe(function(r) { - return self.on_created(r, undefined, prepend_on_create); + return self.on_created(r, prepend_on_create); }, null); } else if (_.isEmpty(values) && ! self.force_dirty) { - // console.log("FormView(", self, ") : Nothing to save"); + // Not dirty, noop save save_deferral = $.Deferred().resolve({}).promise(); } else { self.force_dirty = false; - // console.log("FormView(", self, ") : About to save", values); + // Write save save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) { return self.on_saved(r); }, null); } - return save_deferral.then(success); + return save_deferral; } } catch (e) { console.error(e); @@ -830,14 +831,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM warnings.push('</ul>'); this.do_warn("The following fields are invalid :", warnings.join('')); }, - on_saved: function(r, success) { + /** + * Reload the form after saving + * + * @param {Object} r result of the write function. + */ + on_saved: function(r) { if (!r.result) { // should not happen in the server, but may happen for internal purpose return $.Deferred().reject(); } else { return $.when(this.reload()).pipe(function () { - return r; }) - .then(success); + return r; + }); } }, /** @@ -850,10 +856,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM * * Updates the pager and sidebar displays * * @param {Object} r - * @param {Function} success callback to execute after having updated the dataset - * @param {Boolean} [prepend_on_create=false] adds the newly created record at the beginning of the dataset instead of the end + * @param {Boolean} [prepend_on_create=false] adds the newly created record + * at the beginning of the dataset instead of the end */ - on_created: function(r, success, prepend_on_create) { + on_created: function(r, prepend_on_create) { if (!r.result) { // should not happen in the server, but may happen for internal purpose return $.Deferred().reject(); @@ -872,8 +878,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } //openerp.log("The record has been created with id #" + this.datarecord.id); return $.when(this.reload()).pipe(function () { - return _.extend(r, {created: true}); }) - .then(success); + return _.extend(r, {created: true}); + }); } }, on_action: function (action) { @@ -960,15 +966,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return false; } var displayed = value; - switch (field.field.type) { - case 'selection': + if (field instanceof instance.web.form.FieldSelection) { displayed = _(field.values).find(function (option) { return option[0] === value; })[1]; - break; - case 'many2one': + } else if (field instanceof instance.web.form.FieldMany2One) { displayed = field.get_displayed(); - break; } return { @@ -996,14 +999,14 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM buttons: [ {text: _t("Close"), click: function () { d.close(); }}, {text: _t("Save default"), click: function () { - var $defaults = d.$element.find('#formview_default_fields'); + var $defaults = d.$el.find('#formview_default_fields'); var field_to_set = $defaults.val(); if (!field_to_set) { $defaults.parent().addClass('oe_form_invalid'); return; } - var condition = d.$element.find('#formview_default_conditions').val(), - all_users = d.$element.find('#formview_default_all').is(':checked'); + var condition = d.$el.find('#formview_default_conditions').val(), + all_users = d.$el.find('#formview_default_all').is(':checked'); new instance.web.DataSet(self, 'ir.values').call( 'set_default', [ self.dataset.model, @@ -1057,7 +1060,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM instance.web.form.FormRenderingEngineInterface = instance.web.Class.extend({ set_fields_view: function(fields_view) {}, set_fields_registry: function(fields_registry) {}, - render_to: function($element) {}, + render_to: function($el) {}, }); /** @@ -1462,7 +1465,7 @@ instance.web.form.FormDialog = instance.web.Dialog.extend({ this.form = new instance.web.FormView(this, this.dataset, this.view_id, { pager: false }); - this.form.appendTo(this.$element); + this.form.appendTo(this.$el); this.form.on_created.add_last(this.on_form_dialog_saved); this.form.on_saved.add_last(this.on_form_dialog_saved); return this; @@ -1554,7 +1557,7 @@ instance.web.form.compute_domain = function(expr, fields) { /** * Must be applied over an class already possessing the PropertiesMixin. * - * Apply the result of the "invisible" domain to this.$element. + * Apply the result of the "invisible" domain to this.$el. */ instance.web.form.InvisibilityChangerMixin = { init: function(field_manager, invisible_domain) { @@ -1585,16 +1588,16 @@ instance.web.form.InvisibilityChangerMixin = { this._check_visibility(); }, _check_visibility: function() { - this.$element.toggleClass('oe_form_invisible', this.get("effective_invisible")); + this.$el.toggleClass('oe_form_invisible', this.get("effective_invisible")); }, }; instance.web.form.InvisibilityChanger = instance.web.Class.extend(instance.web.PropertiesMixin, instance.web.form.InvisibilityChangerMixin, { - init: function(parent, field_manager, invisible_domain, $element) { + init: function(parent, field_manager, invisible_domain, $el) { this.setParent(parent); instance.web.PropertiesMixin.init.call(this); instance.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain); - this.$element = $element; + this.$el = $el; this.start(); }, }); @@ -1618,7 +1621,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi }, renderElement: function() { this._super(); - this.$element.addClass(this.node.attrs["class"] || ""); + this.$el.addClass(this.node.attrs["class"] || ""); }, destroy: function() { $.fn.tipsy.clear(); @@ -1652,7 +1655,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi }, do_attach_tooltip: function(widget, trigger, options) { widget = widget || this; - trigger = trigger || this.$element; + trigger = trigger || this.$el; options = _.extend({ delayIn: 500, delayOut: 0, @@ -1739,11 +1742,11 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ }, start: function() { this._super.apply(this, arguments); - this.$element.click(this.on_click); + this.$el.click(this.on_click); if (this.node.attrs.help || instance.session.debug) { this.do_attach_tooltip(); } - this.setupFocus(this.$element); + this.setupFocus(this.$el); }, on_click: function() { var self = this; @@ -1802,8 +1805,8 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ }, check_disable: function() { var disabled = (this.force_disabled || !this.view.is_interactible_record()); - this.$element.prop('disabled', disabled); - this.$element.css('color', disabled ? 'grey' : ''); + this.$el.prop('disabled', disabled); + this.$el.css('color', disabled ? 'grey' : ''); } }); @@ -1932,14 +1935,14 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w var self = this; this._super(); if (this.field.translate) { - this.$element.addClass('oe_form_field_translatable'); - this.$element.find('.oe_field_translate').click(_.bind(function() { + this.$el.addClass('oe_form_field_translatable'); + this.$el.find('.oe_field_translate').click(_.bind(function() { this.field_manager.open_translate_dialog(this); }, this)); } - this.$label = this.view.$element.find('label[for=' + this.id_for_label + ']'); + this.$label = this.view.$el.find('label[for=' + this.id_for_label + ']'); if (instance.session.debug) { - this.do_attach_tooltip(this, this.$label[0] || this.$element); + this.do_attach_tooltip(this, this.$label[0] || this.$el); this.$label.off('dblclick').on('dblclick', function() { console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view); window.w = self; @@ -1958,7 +1961,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w * Private. Do not use. */ _set_required: function() { - this.$element.toggleClass('oe_form_required', this.get("required")); + this.$el.toggleClass('oe_form_required', this.get("required")); }, set_value: function(value_) { this._inhibit_on_change = true; @@ -1983,11 +1986,11 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w }, _check_css_flags: function() { if (this.field.translate) { - this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode()); + this.$el.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode()); } if (!this.disable_utility_classes) { if (this.field_manager.get('display_invalid_fields')) { - this.$element.toggleClass('oe_form_invalid', !this.is_valid()); + this.$el.toggleClass('oe_form_invalid', !this.is_valid()); } } }, @@ -2045,7 +2048,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we }, initialize_content: function() { var self = this; - var $input = this.$element.find('input'); + var $input = this.$el.find('input'); $input.change(function() { self.set({'value': instance.web.parse_value($input.val(), self)}); }); @@ -2058,18 +2061,18 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we render_value: function() { var show_value = instance.web.format_value(this.get('value'), this, ''); if (!this.get("effective_readonly")) { - this.$element.find('input').val(show_value); + this.$el.find('input').val(show_value); } else { if (this.password) { show_value = new Array(show_value.length + 1).join('*'); } - this.$element.text(show_value); + this.$el.text(show_value); } }, is_syntax_valid: function() { if (!this.get("effective_readonly")) { try { - var value_ = instance.web.parse_value(this.$element.find('input').val(), this, ''); + var value_ = instance.web.parse_value(this.$el.find('input').val(), this, ''); return true; } catch(e) { return false; @@ -2093,7 +2096,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({ template: 'FieldEmail', initialize_content: function() { this._super(); - var $button = this.$element.find('button'); + var $button = this.$el.find('button'); $button.click(this.on_button_clicked); this.setupFocus($button); }, @@ -2101,7 +2104,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({ if (!this.get("effective_readonly")) { this._super(); } else { - this.$element.find('a') + this.$el.find('a') .attr('href', 'mailto:' + this.get('value')) .text(this.get('value') || ''); } @@ -2119,7 +2122,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({ template: 'FieldUrl', initialize_content: function() { this._super(); - var $button = this.$element.find('button'); + var $button = this.$el.find('button'); $button.click(this.on_button_clicked); this.setupFocus($button); }, @@ -2132,7 +2135,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({ if (!s) { tmp = "http://" + this.get('value'); } - this.$element.find('a').attr('href', tmp).text(this.get('value') ? tmp : ''); + this.$el.find('a').attr('href', tmp).text(this.get('value') ? tmp : ''); } }, on_button_clicked: function() { @@ -2181,8 +2184,8 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ }, start: function() { var self = this; - this.$input = this.$element.find('input.oe_datepicker_master'); - this.$input_picker = this.$element.find('input.oe_datepicker_container'); + this.$input = this.$el.find('input.oe_datepicker_master'); + this.$input_picker = this.$el.find('input.oe_datepicker_container'); this.$input.change(this.on_change); this.picker({ onClose: this.on_picker_select, @@ -2192,7 +2195,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ showWeek: true, showButtonPanel: true }); - this.$element.find('img.oe_datepicker_trigger').click(function() { + this.$el.find('img.oe_datepicker_trigger').click(function() { if (self.get("effective_readonly") || self.picker('widget').is(':visible')) { self.$input.focus(); return; @@ -2229,7 +2232,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ set_readonly: function(readonly) { this.readonly = readonly; this.$input.prop('readonly', this.readonly); - this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly); + this.$el.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly); }, is_valid_: function() { var value_ = this.$input.val(); @@ -2279,7 +2282,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc this.datewidget.on_change.add_last(_.bind(function() { this.set({'value': this.datewidget.get_value()}); }, this)); - this.datewidget.appendTo(this.$element); + this.datewidget.appendTo(this.$el); this.setupFocus(this.datewidget.$input); } }, @@ -2291,7 +2294,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc if (!this.get("effective_readonly")) { this.datewidget.set_value(this.get('value')); } else { - this.$element.text(instance.web.format_value(this.get('value'), this, '')); + this.$el.text(instance.web.format_value(this.get('value'), this, '')); } }, is_syntax_valid: function() { @@ -2320,7 +2323,7 @@ instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, { template: 'FieldText', initialize_content: function() { - this.$textarea = this.$element.find('textarea'); + this.$textarea = this.$el.find('textarea'); if (!this.get("effective_readonly")) { this.$textarea.change(_.bind(function() { this.set({'value': instance.web.parse_value(this.$textarea.val(), this)}); @@ -2328,7 +2331,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we } else { this.$textarea.attr('disabled', 'disabled'); } - this.$element.keyup(function (e) { + this.$el.keyup(function (e) { if (e.which === $.ui.keyCode.ENTER) { e.stopPropagation(); } @@ -2360,7 +2363,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we is_false: function() { return this.get('value') === '' || this._super(); }, - focus: function($element) { + focus: function($el) { this.$textarea.focus(); }, }); @@ -2385,7 +2388,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc var self = this; if (! this.get("effective_readonly")) { self._updating_editor = false; - this.$textarea = this.$element.find('textarea'); + this.$textarea = this.$el.find('textarea'); var width = ((this.node.attrs || {}).editor_width || 468); var height = ((this.node.attrs || {}).editor_height || 250); this.$textarea.cleditor({ @@ -2418,7 +2421,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc this.$cleditor.updateFrame(); this._updating_editor = false; } else { - this.$element.html(this.get('value')); + this.$el.html(this.get('value')); } }, }); @@ -2428,9 +2431,9 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ start: function() { var self = this; this._super.apply(this, arguments); - this.$checkbox = $("input", this.$element); + this.$checkbox = $("input", this.$el); this.setupFocus(this.$checkbox); - this.$element.click(_.bind(function() { + this.$el.click(_.bind(function() { this.set({'value': this.$checkbox.is(':checked')}); }, this)); var check_readonly = function() { @@ -2452,7 +2455,7 @@ instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({ template: 'FieldProgressBar', start: function() { this._super.apply(this, arguments); - this.$element.progressbar({ + this.$el.progressbar({ value: this.get('value'), disabled: this.get("effective_readonly") }); @@ -2464,7 +2467,7 @@ instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({ show_value = 0; } var formatted_value = instance.web.format_value(show_value, { type : 'float' }, '0'); - this.$element.progressbar('option', 'value', show_value).find('span').html(formatted_value + '%'); + this.$el.progressbar('option', 'value', show_value).find('span').html(formatted_value + '%'); } }); @@ -2495,9 +2498,9 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan // changing the selected value), takes the action as validating the // row var ischanging = false; - var $select = this.$element.find('select') + var $select = this.$el.find('select') .change(_.bind(function() { - this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]}); + this.set({'value': this.values[this.$el.find('select')[0].selectedIndex][0]}); }, this)) .change(function () { ischanging = true; }) .click(function () { ischanging = false; }) @@ -2520,27 +2523,27 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan for (var i = 0, ii = this.values.length; i < ii; i++) { if (this.values[i][0] === this.get('value')) index = i; } - this.$element.find('select')[0].selectedIndex = index; + this.$el.find('select')[0].selectedIndex = index; } else { var self = this; var option = _(this.values) .detect(function (record) { return record[0] === self.get('value'); }); - this.$element.text(option ? option[1] : this.values[0][1]); + this.$el.text(option ? option[1] : this.values[0][1]); } }, is_syntax_valid: function() { if (this.get("effective_readonly")) { return true; } - var value_ = this.values[this.$element.find('select')[0].selectedIndex]; + var value_ = this.values[this.$el.find('select')[0].selectedIndex]; return !! value_; }, focus: function() { - this.$element.find('select:first').focus(); + this.$el.find('select:first').focus(); } }); -// jquery autocomplete tweak to allow html +// jquery autocomplete tweak to allow html and classnames (function() { var proto = $.ui.autocomplete.prototype, initSource = proto._initSource; @@ -2567,7 +2570,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan return $( "<li></li>" ) .data( "item.autocomplete", item ) .append( $( "<a></a>" )[ this.options.html ? "html" : "text" ]( item.label ) ) - .appendTo( ul ); + .appendTo( ul ) + .addClass(item.classname); } }); })(); @@ -2607,25 +2611,36 @@ instance.web.form.CompletionFieldMixin = { // search more... if more results that max if (values.length > self.limit) { values = values.slice(0, self.limit); - values.push({label: _t("<em>   Search More...</em>"), action: function() { - dataset.name_search(search_val, self.build_domain(), 'ilike' - , false, function(data) { - self._search_create_popup("search", data); - }); - }}); + values.push({ + label: _t("Search More..."), + action: function() { + dataset.name_search(search_val, self.build_domain(), 'ilike', false, function(data) { + self._search_create_popup("search", data); + }); + }, + classname: 'oe_m2o_dropdown_option' + }); } // quick create var raw_result = _(data.result).map(function(x) {return x[1];}); if (search_val.length > 0 && !_.include(raw_result, search_val)) { - values.push({label: _.str.sprintf(_t('<em>   Create "<strong>%s</strong>"</em>'), - $('<span />').text(search_val).html()), action: function() { - self._quick_create(search_val); - }}); + values.push({ + label: _.str.sprintf(_t('Create "<strong>%s</strong>"'), + $('<span />').text(search_val).html()), + action: function() { + self._quick_create(search_val); + }, + classname: 'oe_m2o_dropdown_option' + }); } // create... - values.push({label: _t("<em>   Create and Edit...</em>"), action: function() { - self._search_create_popup("form", undefined, {}); - }}); + values.push({ + label: _t("Create and Edit..."), + action: function() { + self._search_create_popup("form", undefined, self._create_context(search_val)); + }, + classname: 'oe_m2o_dropdown_option' + }); return values; }); @@ -2636,7 +2651,7 @@ instance.web.form.CompletionFieldMixin = { _quick_create: function(name) { var self = this; var slow_create = function () { - self._search_create_popup("form", undefined, {"default_name": name}); + self._search_create_popup("form", undefined, self._create_context(name)); }; if (self.options.quick_create === undefined || self.options.quick_create) { new instance.web.DataSet(this, this.field.relation, self.build_context()) @@ -2673,6 +2688,13 @@ instance.web.form.CompletionFieldMixin = { * To implement. */ add_id: function(id) {}, + _create_context: function(name) { + var tmp = {}; + var field = (this.options || {}).create_name_field; + if (field) + tmp["default_" + field] = name; + return tmp; + }, }; instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, { @@ -2707,7 +2729,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc }, render_editable: function() { var self = this; - this.$input = this.$element.find("input"); + this.$input = this.$el.find("input"); self.$input.tipsy({ title: function() { @@ -2727,8 +2749,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.$input.tipsy("hide"); }); - this.$drop_down = this.$element.find(".oe_m2o_drop_down_button"); - this.$follow_button = $(".oe_m2o_cm_button", this.$element); + this.$drop_down = this.$el.find(".oe_m2o_drop_down_button"); + this.$follow_button = $(".oe_m2o_cm_button", this.$el); this.$follow_button.click(function() { if (!self.get('value')) { @@ -2839,7 +2861,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value["" + item.id] = item.name; self.set({value: item.id}); } else if (item.action) { - self.floating = true; item.action(); // Cancel widget blurring, to avoid form blur event self.trigger('focused'); @@ -2903,7 +2924,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc if (follow) link += "<br />"; } - var $link = this.$element.find('.oe_form_uri') + var $link = this.$el.find('.oe_form_uri') .unbind('click') .html(link); if (! this.options.no_open) @@ -2918,7 +2939,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc }); return false; }); - $(".oe_form_m2o_follow", this.$element).html(follow); + $(".oe_form_m2o_follow", this.$el).html(follow); } }, set_value: function(value_) { @@ -3019,7 +3040,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }, start: function() { this._super.apply(this, arguments); - this.$element.addClass('oe_form_field oe_form_field_one2many'); + this.$el.addClass('oe_form_field oe_form_field_one2many'); var self = this; @@ -3129,7 +3150,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ } } else if (view_type === "form") { if (self.get("effective_readonly")) { - $(".oe_form_buttons", controller.$element).children().remove(); + $(".oe_form_buttons", controller.$el).children().remove(); } controller.on_record_loaded.add_last(function() { once.resolve(); @@ -3150,7 +3171,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }); this.is_setted.then(function() { $.async_when().then(function () { - self.viewmanager.appendTo(self.$element); + self.viewmanager.appendTo(self.$el); }); }); return def; @@ -3371,7 +3392,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ }, start: function () { var ret = this._super(); - this.$element + this.$el .off('mousedown.handleButtons') .on('mousedown.handleButtons', 'table button', this.proxy('_button_down')); return ret; @@ -3385,7 +3406,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ // If the form has not been modified, the view can only be valid // NB: is_dirty will also be set on defaults/onchanges/whatever? // oe_form_dirty seems to only be set on actual user actions - if (!form.$element.is('.oe_form_dirty')) { + if (!form.$el.is('.oe_form_dirty')) { return true; } this.o2m._dirty_flag = true; @@ -3499,7 +3520,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ return; } // FIXME: why isn't there an API for this? - if (this.editor.form.$element.hasClass('oe_form_dirty')) { + if (this.editor.form.$el.hasClass('oe_form_dirty')) { this.save_edition(); return; } @@ -3627,7 +3648,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in if (this.get("effective_readonly")) return; var self = this; - self.$text = $("textarea", this.$element); + self.$text = $("textarea", this.$el); self.$text.textext({ plugins : 'tags arrow autocomplete', autocomplete: { @@ -3685,7 +3706,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in self._drop_shown = true; }); self.tags = self.$text.textext()[0].tags(); - $("textarea", this.$element).focusout(function() { + $("textarea", this.$el).focusout(function() { self.$text.trigger("setInputData", ""); }).keydown(function(e) { if (e.which === $.ui.keyCode.TAB && self._drop_shown) { @@ -3719,10 +3740,10 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in data = _.map(values, function(el) { return indexed[el]; }); if (! self.get("effective_readonly")) { self.tags.containerElement().children().remove(); - $("textarea", self.$element).css("padding-left", "3px"); + $("textarea", self.$el).css("padding-left", "3px"); self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};})); } else { - self.$element.html(QWeb.render("FieldMany2ManyTag", {elements: data})); + self.$el.html(QWeb.render("FieldMany2ManyTag", {elements: data})); } }; if (! values || values.length > 0) { @@ -3750,7 +3771,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ }, start: function() { this._super.apply(this, arguments); - this.$element.addClass('oe_form_field oe_form_field_many2many'); + this.$el.addClass('oe_form_field oe_form_field_many2many'); var self = this; @@ -3813,7 +3834,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ loaded.resolve(); }); $.async_when().then(function () { - self.list_view.appendTo(self.$element); + self.list_view.appendTo(self.$el); }); return loaded; }, @@ -3941,7 +3962,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( }); this.kanban_view.do_switch_view.add_last(_.bind(this.open_popup, this)); $.async_when().then(function () { - self.kanban_view.appendTo(self.$element); + self.kanban_view.appendTo(self.$el); }); return loaded; }, @@ -4025,7 +4046,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({ }, start: function () { var self = this; - self.$text = this.$element.find('input').css("width", "200px"); + self.$text = this.$el.find('input').css("width", "200px"); self.$text.textext({ plugins : 'arrow autocomplete', autocomplete: { @@ -4133,8 +4154,8 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }, title: this.options.title || "", buttons: [{text:"tmp"}], - }, this.$element).open(); - this.$buttonpane = dialog.$element.dialog("widget").find(".ui-dialog-buttonpane").html(""); + }, this.$el).open(); + this.$buttonpane = dialog.$el.dialog("widget").find(".ui-dialog-buttonpane").html(""); this.start(); }, on_write_completed: function() {}, @@ -4157,7 +4178,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ if (this.options.alternative_form_view) { this.view_form.set_embedded_view(this.options.alternative_form_view); } - this.view_form.appendTo(this.$element.find(".oe_popup_form")); + this.view_form.appendTo(this.$el.find(".oe_popup_form")); this.view_form.on_loaded.add_last(function() { var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", { @@ -4197,7 +4218,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.destroy(); }, destroy: function () { - this.$element.dialog('close'); + this.$el.dialog('close'); this._super(); }, }); @@ -4289,7 +4310,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend e.cancel = true; }); self.view_list.popup = self; - self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() { + self.view_list.appendTo($(".oe_popup_list", self.$el)).pipe(function() { self.view_list.do_show(); }).pipe(function() { self.searchview.do_search(); @@ -4307,7 +4328,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }); }); }); - this.searchview.appendTo($(".oe_popup_list", self.$element)); + this.searchview.appendTo($(".oe_popup_list", self.$el)); }, do_search: function(domains, contexts, groupbys) { var self = this; @@ -4333,7 +4354,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend this.searchview.hide(); } if (this.view_list) { - this.view_list.$element.hide(); + this.view_list.$el.hide(); } this.setup_form_view(); }, @@ -4366,7 +4387,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan var sel = this.selection.get_value(); this.m2o.field.relation = sel; this.m2o.set_value(false); - this.m2o.$element.toggle(sel !== false); + this.m2o.$el.toggle(sel !== false); } }, destroy_content: function() { @@ -4470,9 +4491,9 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. this._super.apply(this, arguments); }, initialize_content: function() { - this.$element.find('input.oe_form_binary_file').change(this.on_file_change); - this.$element.find('button.oe_form_binary_file_save').click(this.on_save_as); - this.$element.find('.oe_form_binary_file_clear').click(this.on_clear); + this.$el.find('input.oe_form_binary_file').change(this.on_file_change); + this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as); + this.$el.find('.oe_form_binary_file_clear').click(this.on_clear); }, human_filesize : function(size) { var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; @@ -4489,10 +4510,10 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler if ($(e.target).val() !== '') { - this.$element.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); - this.$element.find('form.oe_form_binary_form').submit(); - this.$element.find('.oe_form_binary_progress').show(); - this.$element.find('.oe_form_binary').hide(); + this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); + this.$el.find('form.oe_form_binary_form').submit(); + this.$el.find('.oe_form_binary_progress').show(); + this.$el.find('.oe_form_binary').hide(); } }, on_file_uploaded: function(size, name, content_type, file_base64) { @@ -4504,8 +4525,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. this.filename = name; this.on_file_uploaded_and_valid.apply(this, arguments); } - this.$element.find('.oe_form_binary_progress').hide(); - this.$element.find('.oe_form_binary').show(); + this.$el.find('.oe_form_binary_progress').hide(); + this.$el.find('.oe_form_binary').show(); }, on_file_uploaded_and_valid: function(size, name, content_type, file_base64) { }, @@ -4559,7 +4580,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({ this._super(); if (this.get("effective_readonly")) { var self = this; - this.$element.find('a').click(function() { + this.$el.find('a').click(function() { if (self.get('value')) { self.on_save_as(); } @@ -4579,12 +4600,12 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({ } else { show_value = (this.get('value') != null && this.get('value') !== false) ? this.get('value') : ''; } - this.$element.find('input').eq(0).val(show_value); + this.$el.find('input').eq(0).val(show_value); } else { - this.$element.find('a').show(!!this.get('value')); + this.$el.find('a').show(!!this.get('value')); if (this.get('value')) { var show_value = _t("Download") + " " + (this.view.datarecord[this.node.attrs.filename] || ''); - this.$element.find('a').text(show_value); + this.$el.find('a').text(show_value); } } }, @@ -4592,7 +4613,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({ this.binary_value = true; this.set({'value': file_base64}); var show_value = name + " (" + this.human_filesize(size) + ")"; - this.$element.find('input').eq(0).val(show_value); + this.$el.find('input').eq(0).val(show_value); this.set_filename(name); }, set_filename: function(value_) { @@ -4603,7 +4624,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({ }, on_clear: function() { this._super.apply(this, arguments); - this.$element.find('input').eq(0).val(''); + this.$el.find('input').eq(0).val(''); this.set_filename(''); } }); @@ -4615,19 +4636,31 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({ this.render_value(); }, render_value: function() { + var self = this; var url; if (this.get('value') && ! /^\d+(\.\d*)? \w+$/.test(this.get('value'))) { url = 'data:image/png;base64,' + this.get('value'); } else if (this.get('value')) { var id = escape(JSON.stringify(this.view.datarecord.id || null)); + var field = this.name; + if (this.options.preview_image) + field = this.options.preview_image; url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' + - this.view.dataset.model +'&id=' + id + '&field=' + this.name + '&t=' + (new Date().getTime()); + this.view.dataset.model +'&id=' + id + '&field=' + field + '&t=' + (new Date().getTime()); } else { url = "/web/static/src/img/placeholder.png"; } - var img = QWeb.render("FieldBinaryImage-img", { widget: this, url: url }); - this.$element.find('> img').remove(); - this.$element.prepend(img); + var $img = $(QWeb.render("FieldBinaryImage-img", { widget: this, url: url })); + this.$el.find('> img').remove(); + this.$el.prepend($img); + $img.load(function() { + if (! self.options.size) + return; + $img.css("max-width", "" + self.options.size[0] + "px"); + $img.css("max-height", "" + self.options.size[1] + "px"); + $img.css("margin-left", "" + (self.options.size[0] - $img.width()) / 2 + "px"); + $img.css("margin-top", "" + (self.options.size[1] - $img.height()) / 2 + "px"); + }); }, on_file_change: function() { this.render_value(); @@ -4657,11 +4690,11 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ // backward compatibility this.loaded = new $.Deferred(); if (this.options.clickable) { - this.$element.on('click','li',this.on_click_stage); + this.$el.on('click','li',this.on_click_stage); } // TODO move the following into css :after - if (this.$element.parent().is('header')) { - this.$element.after('<div class="oe_clear"/>'); + if (this.$el.parent().is('header')) { + this.$el.after('<div class="oe_clear"/>'); } }, set_value: function(value_) { @@ -4706,14 +4739,12 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ // statusbar_visible attribute of the field. For example: // statusbar_visible="draft,open". var selection = this.field.selection; - console.log(selection); for(var i=0; i< selection.length; i++) { var key = selection[i][0]; if(key == this.selected_value || !this.options.visible || this.options.visible.indexOf(key) != -1) { this.selection.push(selection[i]); } } - console.log(this.selection); this.render_elements(); } }, @@ -4724,7 +4755,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ render_elements: function () { var self = this; var content = instance.web.qweb.render("FieldStatus.content", {widget: this}); - this.$element.html(content); + this.$el.html(content); var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}"); var color = colors[this.selected_value]; if (color) { diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 95dfa78fd63..a2dccf2ec73 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -145,7 +145,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi * @returns {$.Deferred} loading promise */ start: function() { - this.$element.addClass('oe_list'); + this.$el.addClass('oe_list'); return this.reload_view(null, null, true); }, /** @@ -248,20 +248,20 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi this.setup_columns(this.fields_view.fields, grouped); - this.$element.html(QWeb.render(this._template, this)); - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.html(QWeb.render(this._template, this)); + this.$el.addClass(this.fields_view.arch.attrs['class']); // Head hook // Selecting records - this.$element.find('.oe_list_record_selector').click(function(){ - self.$element.find('.oe_list_record_selector input').prop('checked', - self.$element.find('.oe_list_record_selector').prop('checked') || false); + this.$el.find('.oe_list_record_selector').click(function(){ + self.$el.find('.oe_list_record_selector input').prop('checked', + self.$el.find('.oe_list_record_selector').prop('checked') || false); var selection = self.groups.get_selection(); $(self.groups).trigger( 'selected', [selection.ids, selection.records]); }); // Sorting columns - this.$element.find('thead').delegate('th.oe_sortable[data-id]', 'click', function (e) { + this.$el.find('thead').delegate('th.oe_sortable[data-id]', 'click', function (e) { e.stopPropagation(); var $this = $(this); self.dataset.sort($this.data('id')); @@ -281,7 +281,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi if (this.options.$buttons) { this.$buttons.appendTo(this.options.$buttons); } else { - this.$element.find('.oe_list_buttons').replaceWith(this.$buttons); + this.$el.find('.oe_list_buttons').replaceWith(this.$buttons); } this.$buttons.find('.oe_list_add') .click(this.proxy('do_add_record')) @@ -298,7 +298,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi if (this.options.$buttons) { this.$pager.appendTo(this.options.$pager); } else { - this.$element.find('.oe_list_pager').replaceWith(this.$pager); + this.$el.find('.oe_list_pager').replaceWith(this.$pager); } this.$pager @@ -357,7 +357,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi { label: _t('Delete'), callback: this.do_delete_selected } ]); this.sidebar.add_toolbar(this.fields_view.toolbar); - this.sidebar.$element.hide(); + this.sidebar.$el.hide(); } }, /** @@ -450,7 +450,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi }, do_hide: function () { if (this.sidebar) { - this.sidebar.$element.hide(); + this.sidebar.$el.hide(); } if (this.$buttons) { this.$buttons.hide(); @@ -490,10 +490,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi */ reload_content: function () { var self = this; - self.$element.find('.oe_list_record_selector').prop('checked', false); + self.$el.find('.oe_list_record_selector').prop('checked', false); this.records.reset(); var reloaded = $.Deferred(); - this.$element.find('.oe_list_content').append( + this.$el.find('.oe_list_content').append( this.groups.render(function () { if (self.dataset.index == null) { var has_one = false; @@ -595,7 +595,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi if (!ids.length) { this.dataset.index = 0; if (this.sidebar) { - this.sidebar.$element.hide(); + this.sidebar.$el.hide(); } this.compute_aggregates(); return; @@ -603,7 +603,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi this.dataset.index = _(this.dataset.ids).indexOf(ids[0]); if (this.sidebar) { - this.sidebar.$element.show(); + this.sidebar.$el.show(); } this.compute_aggregates(_(records).map(function (record) { @@ -763,7 +763,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi }, display_aggregates: function (aggregation) { var self = this; - var $footer_cells = this.$element.find('.oe_list_footer'); + var $footer_cells = this.$el.find('.oe_list_footer'); _(this.aggregate_columns).each(function (column) { if (!column['function']) { return; @@ -789,7 +789,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi pad_columns: function (count, options) { options = options || {}; // padding for action/pager header - var $first_header = this.$element.find('thead tr:first th'); + var $first_header = this.$el.find('thead tr:first th'); var colspan = $first_header.attr('colspan'); if (colspan) { if (!this.previous_colspan) { @@ -798,7 +798,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi $first_header.attr('colspan', parseInt(colspan, 10) + count); } // Padding for column titles, footer and data rows - var $rows = this.$element + var $rows = this.$el .find('.oe_list_header_columns, tr:not(thead tr)') .not(options['except']); var newcols = new Array(count+1).join('<td class="oe_list_padding"></td>'); @@ -812,23 +812,23 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi * Removes all padding columns of the table */ unpad_columns: function () { - this.$element.find('.oe_list_padding').remove(); + this.$el.find('.oe_list_padding').remove(); if (this.previous_colspan) { - this.$element + this.$el .find('thead tr:first th') .attr('colspan', this.previous_colspan); this.previous_colspan = null; } }, no_result: function () { - this.$element.find('.oe_view_nocontent').remove(); + this.$el.find('.oe_view_nocontent').remove(); if (this.groups.group_by || !this.options.action || !this.options.action.help) { return; } - this.$element.find('table:first').hide(); - this.$element.prepend( + this.$el.find('table:first').hide(); + this.$el.prepend( $('<div class="oe_view_nocontent">').html(this.options.action.help) ); } @@ -1478,27 +1478,27 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we }, render: function (post_render) { var self = this; - var $element = $('<tbody>'); - this.elements = [$element[0]]; + var $el = $('<tbody>'); + this.elements = [$el[0]]; this.datagroup.list( _(this.view.visible_columns).chain() .filter(function (column) { return column.tag === 'field' }) .pluck('name').value(), function (groups) { - $element[0].appendChild( + $el[0].appendChild( self.render_groups(groups)); if (post_render) { post_render(); } }, function (dataset) { self.render_dataset(dataset).then(function (list) { self.children[null] = list; self.elements = - [list.$current.replaceAll($element)[0]]; + [list.$current.replaceAll($el)[0]]; self.setup_resequence_rows(list, dataset); if (post_render) { post_render(); } }); }); - return $element; + return $el; }, /** * Returns the ids of all selected records for this group, and the records diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 9a101a5ac1a..65f5620c1a9 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -45,10 +45,10 @@ openerp.web.list_editable = function (instance) { } }); this.on('edit:after', this, function () { - self.$element.add(self.$buttons).addClass('oe_editing'); + self.$el.add(self.$buttons).addClass('oe_editing'); }); this.on('save:after cancel:after', this, function () { - self.$element.add(self.$buttons).removeClass('oe_editing'); + self.$el.add(self.$buttons).removeClass('oe_editing'); }); }, destroy: function () { @@ -87,8 +87,8 @@ openerp.web.list_editable = function (instance) { */ do_add_record: function () { if (this.editable()) { - this.$element.find('table:first').show(); - this.$element.find('.oe_view_nocontent').remove(); + this.$el.find('table:first').show(); + this.$el.find('.oe_view_nocontent').remove(); this.start_edition(); } else { this._super(); @@ -99,7 +99,7 @@ openerp.web.list_editable = function (instance) { // tree/@editable takes priority on everything else if present. var result = this._super(data, grouped); if (this.editable()) { - this.$element.addClass('oe_list_editable'); + this.$el.addClass('oe_list_editable'); // FIXME: any hook available to ensure this is only done once? this.$buttons .off('click', '.oe_list_save') @@ -109,7 +109,7 @@ openerp.web.list_editable = function (instance) { e.preventDefault(); self.cancel_edition(); }); - this.$element + this.$el .off('click', 'tbody td:not(.oe_list_field_cell)') .on('click', 'tbody td:not(.oe_list_field_cell)', function () { if (!self.editor.is_editing()) { @@ -120,12 +120,12 @@ openerp.web.list_editable = function (instance) { // Editor is not restartable due to formview not being // restartable this.editor = this.make_editor(); - var editor_ready = this.editor.prependTo(this.$element) + var editor_ready = this.editor.prependTo(this.$el) .then(this.proxy('setup_events')); return $.when(result, editor_ready); } else { - this.$element.removeClass('oe_list_editable'); + this.$el.removeClass('oe_list_editable'); } return result; @@ -203,7 +203,7 @@ openerp.web.list_editable = function (instance) { } // FIXME: need better way to get the field back from bubbling (delegated) DOM events somehow - field.$element.attr('data-fieldname', field_name); + field.$el.attr('data-fieldname', field_name); self.fields_for_resize.push({field: field, cell: cell}); }, options).pipe(function () { $recordRow.addClass('oe_edition'); @@ -249,8 +249,8 @@ openerp.web.list_editable = function (instance) { var position = $cell.position(); // jquery does not understand !important - field.$element.attr('style', 'width: '+$cell.outerWidth()+'px !important') - field.$element.css({ + field.$el.attr('style', 'width: '+$cell.outerWidth()+'px !important') + field.$el.css({ top: position.top, left: position.left, minHeight: $cell.outerHeight() @@ -391,7 +391,7 @@ openerp.web.list_editable = function (instance) { }, setup_events: function () { var self = this; - this.editor.$element.on('keyup keydown', function (e) { + this.editor.$el.on('keyup keydown', function (e) { if (!self.editor.is_editing()) { return; } var key = _($.ui.keyCode).chain() .map(function (v, k) { return {name: k, code: v}; }) @@ -540,7 +540,7 @@ openerp.web.list_editable = function (instance) { if (--field_index < 0) { return $.when(); } field = fields[fields_order[field_index]]; - } while (!field.$element.is(':visible')); + } while (!field.$el.is(':visible')); // and focus it field.focus(); @@ -563,7 +563,7 @@ openerp.web.list_editable = function (instance) { if (++field_index >= fields_order.length) { return $.when(); } field = fields[fields_order[field_index]]; - } while (!field.$element.is(':visible')); + } while (!field.$el.is(':visible')); field.focus(); return $.when(); @@ -572,11 +572,11 @@ openerp.web.list_editable = function (instance) { var form = this.editor.form; var last_field = _(form.fields_order).chain() .map(function (name) { return form.fields[name]; }) - .filter(function (field) { return field.$element.is(':visible'); }) + .filter(function (field) { return field.$el.is(':visible'); }) .last() .value(); // tabbed from last field in form - if (last_field && last_field.$element.has(e.target).length) { + if (last_field && last_field.$el.has(e.target).length) { e.preventDefault(); return this._next(); } @@ -620,7 +620,7 @@ openerp.web.list_editable = function (instance) { var _super = this._super(); this.form.embedded_view = this._validate_view( this.delegate.edition_view(this)); - var form_ready = this.form.appendTo(this.$element).then( + var form_ready = this.form.appendTo(this.$el).then( self.form.proxy('do_hide')); return $.when(_super, form_ready); }, @@ -678,7 +678,7 @@ openerp.web.list_editable = function (instance) { // Is actually in the form && (field = form.fields[focus_field]) // And is visible - && field.$element.is(':visible')) { + && field.$el.is(':visible')) { // focus it field.focus(); return; @@ -687,7 +687,7 @@ openerp.web.list_editable = function (instance) { _(form.fields_order).detect(function (name) { // look for first visible field in fields_order, focus it var field = form.fields[name]; - if (!field.$element.is(':visible')) { + if (!field.$el.is(':visible')) { return false; } // Stop as soon as a field got focused @@ -716,7 +716,7 @@ openerp.web.list_editable = function (instance) { save: function () { var self = this; return this.form - .do_save(null, this.delegate.prepends_on_create()) + .do_save(this.delegate.prepends_on_create()) .pipe(function (result) { var created = result.created && !self.record.id; if (created) { diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js index 2181b2aa157..e0493a446e2 100644 --- a/addons/web/static/src/js/view_tree.js +++ b/addons/web/static/src/js/view_tree.js @@ -84,13 +84,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie }); this.fields = fields_view.fields; this.hook_row_click(); - this.$element.html(QWeb.render('TreeView', { + this.$el.html(QWeb.render('TreeView', { 'title': this.fields_view.arch.attrs.string, 'fields_view': this.fields_view.arch.children, 'fields': this.fields, 'toolbar': has_toolbar })); - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.addClass(this.fields_view.arch.attrs['class']); this.dataset.read_slice(this.fields_list()).then(function(records) { self.store_record(records); @@ -102,7 +102,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie return; } - var $select = self.$element.find('select') + var $select = self.$el.find('select') .change(function () { var $option = $(this).find(':selected'); self.getdata($option.val()); @@ -120,10 +120,10 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie $select.change(); } }); - this.$element.find("#tree_view_expand").click(function(){ + this.$el.find("#tree_view_expand").click(function(){ self.expand_all(); }); - this.$element.find("#tree_view_collapse").click(function(){ + this.$el.find("#tree_view_collapse").click(function(){ self.collpase_all(); }); // TODO store open nodes in url ?... @@ -143,14 +143,14 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie }, expand_all: function(){ var self = this; - var tr = this.$element.find(".oe-treeview-table tbody tr[id^='treerow_']"); + var tr = this.$el.find(".oe-treeview-table tbody tr[id^='treerow_']"); _.each(tr,function(rec){ self.showcontent($(rec).attr('data-id'),true); }); }, collpase_all: function(){ var self = this; - var root_tr = this.$element.find(".oe-treeview-table tbody tr[data-level='"+1+"']"); + var root_tr = this.$el.find(".oe-treeview-table tbody tr[data-level='"+1+"']"); _.each(root_tr,function(rec){ if($(rec).hasClass('oe_open')){ self.showcontent($(rec).attr('data-id'),false); @@ -187,12 +187,12 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie */ hook_row_click: function () { var self = this; - this.$element.delegate('.treeview-td span, .treeview-tr span', 'click', function (e) { + this.$el.delegate('.treeview-td span, .treeview-tr span', 'click', function (e) { e.stopImmediatePropagation(); self.activate($(this).closest('tr').data('id')); }); - this.$element.delegate('.treeview-tr', 'click', function () { + this.$el.delegate('.treeview-tr', 'click', function () { var $this = $(this), record_id = $this.data('id'), bool = $this.parent().hasClass('oe_open'); @@ -220,7 +220,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie render_data: function(groupby){ var self = this; _.each(_.keys(groupby),function(key){ - var $curr_node = self.$element.find('#treerow_' + key); + var $curr_node = self.$el.find('#treerow_' + key); var record = groupby[key]; var children_rows = QWeb.render('TreeView.rows', { 'records': record, @@ -235,7 +235,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie $curr_node.addClass('oe_open'); $curr_node.after(children_rows); } else { - self.$element.find('tbody').html(children_rows); + self.$el.find('tbody').html(children_rows); } }); self.collpase_all(); @@ -272,11 +272,11 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie // show & hide the contents showcontent: function (record_id, show) { - this.$element.find('#treerow_' + record_id) + this.$el.find('#treerow_' + record_id) .toggleClass('oe_open', show); _(this.records[record_id][this.children_field]).each(function (child_id) { - var $child_row = this.$element.find('#treerow_' + child_id); + var $child_row = this.$el.find('#treerow_' + child_id); if ($child_row.hasClass('oe_open')) { this.showcontent(child_id, false); } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 0831d0c5f8e..c608e662f0a 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -20,7 +20,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ }, start: function() { this._super.apply(this, arguments); - this.$element.on('click', '.oe_breadcrumb_item', this.on_breadcrumb_clicked); + this.$el.on('click', '.oe_breadcrumb_item', this.on_breadcrumb_clicked); }, dialog_stop: function () { if (this.dialog) { @@ -53,10 +53,10 @@ instance.web.ActionManager = instance.web.Widget.extend({ } var item = _.extend({ show: function(index) { - this.widget.$element.show(); + this.widget.$el.show(); }, hide: function() { - this.widget.$element.hide(); + this.widget.$el.hide(); }, destroy: function() { this.widget.destroy(); @@ -277,14 +277,14 @@ instance.web.ActionManager = instance.web.Widget.extend({ } this.dialog.dialog_title = action.name; this.dialog_widget = widget; - this.dialog_widget.appendTo(this.dialog.$element); + this.dialog_widget.appendTo(this.dialog.$el); this.dialog.open(); } else { this.dialog_stop(); this.inner_action = action; this.inner_widget = widget; post_process(); - this.inner_widget.appendTo(this.$element); + this.inner_widget.appendTo(this.$el); } }, ir_actions_act_window: function (action, on_close) { @@ -376,7 +376,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ start: function() { this._super(); var self = this; - this.$element.find('.oe_view_manager_switch a').click(function() { + this.$el.find('.oe_view_manager_switch a').click(function() { self.on_mode_switch($(this).data('view-type')); }).tipsy(); var views_ids = {}; @@ -385,9 +385,9 @@ instance.web.ViewManager = instance.web.Widget.extend({ deferred : $.Deferred(), controller : null, options : _.extend({ - $buttons : self.$element.find('.oe_view_manager_buttons'), - $sidebar : self.flags.sidebar ? self.$element.find('.oe_view_manager_sidebar') : undefined, - $pager : self.$element.find('.oe_view_manager_pager'), + $buttons : self.$el.find('.oe_view_manager_buttons'), + $sidebar : self.flags.sidebar ? self.$el.find('.oe_view_manager_sidebar') : undefined, + $pager : self.$el.find('.oe_view_manager_pager'), action : self.action, action_views_ids : views_ids }, self.flags, self.flags[view.view_type] || {}, view.options || {}) @@ -395,7 +395,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ views_ids[view.view_type] = view.view_id; }); if (this.flags.views_switcher === false) { - this.$element.find('.oe_view_manager_switch').hide(); + this.$el.find('.oe_view_manager_switch').hide(); } // If no default view defined, switch to the first one in sequence var default_view = this.flags.default_view || this.views_src[0].view_type; @@ -432,9 +432,9 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.searchview[(view.controller.searchable === false || this.searchview.hidden) ? 'hide' : 'show'](); } - this.$element + this.$el .find('.oe_view_manager_switch a').parent().removeClass('active'); - this.$element + this.$el .find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]') .parent().addClass('active'); @@ -442,7 +442,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ _.each(_.keys(self.views), function(view_name) { var controller = self.views[view_name].controller; if (controller) { - var container = self.$element.find(".oe_view_manager_view_" + view_name + ":first"); + var container = self.$el.find(".oe_view_manager_view_" + view_name + ":first"); if (view_name === view_type) { container.show(); controller.do_show(view_options || {}); @@ -451,10 +451,10 @@ instance.web.ViewManager = instance.web.Widget.extend({ controller.do_hide(); } // put the <footer> in the dialog's buttonpane - if (self.$element.parent('.ui-dialog-content') && self.$element.find('footer')) { - self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide() - self.$element.find('footer').appendTo( - self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonpane') + if (self.$el.parent('.ui-dialog-content') && self.$el.find('footer')) { + self.$el.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide() + self.$el.find('footer').appendTo( + self.$el.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonpane') ); } } @@ -491,7 +491,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ controller.do_switch_view.add_last(_.bind(this.switch_view, this)); controller.do_prev_view.add_last(this.on_prev_view); - var container = this.$element.find(".oe_view_manager_view_" + view_type); + var container = this.$el.find(".oe_view_manager_view_" + view_type); var view_promise = controller.appendTo(container); this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); @@ -505,7 +505,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ }); }, set_title: function(title) { - this.$element.find('.oe_view_title_text:first').text(title); + this.$el.find('.oe_view_title_text:first').text(title); }, add_breadcrumb: function() { var self = this; @@ -524,7 +524,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ action: this.action, show: function(index) { var view_to_select = views[index]; - self.$element.show(); + self.$el.show(); if (self.active_view !== view_to_select) { self.on_mode_switch(view_to_select); } @@ -600,7 +600,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.searchview = new instance.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false); this.searchview.on_search.add(this.do_searchview_search); - return this.searchview.appendTo(this.$element.find(".oe_view_manager_view_search")); + return this.searchview.appendTo(this.$el.find(".oe_view_manager_view_search")); }, do_searchview_search: function(domains, contexts, groupbys) { var self = this, @@ -717,8 +717,8 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ var manager_ready = $.when(searchview_loaded, main_view_loaded); - this.$element.find('.oe_debug_view').change(this.on_debug_changed); - this.$element.addClass("oe_view_manager_" + (this.action.target || 'current')); + this.$el.find('.oe_debug_view').change(this.on_debug_changed); + this.$el.addClass("oe_view_manager_" + (this.action.target || 'current')); return manager_ready; }, on_debug_changed: function (evt) { @@ -730,7 +730,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ switch (val) { case 'fvg': var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open(); - $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element); + $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$el); break; case 'perm_read': var ids = current_view.get_selected_ids(); @@ -828,7 +828,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ var controller = self.views[self.active_view].controller, fvg = controller.fields_view, view_id = (fvg && fvg.view_id) || '--'; - self.$element.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', { + self.$el.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', { view: controller, view_manager: self })); @@ -842,7 +842,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ return r; }, set_title: function(title) { - this.$element.find('.oe_breadcrumb_title:first').html(this.getParent().get_title()); + this.$el.find('.oe_breadcrumb_title:first').html(this.getParent().get_title()); }, do_push_state: function(state) { if (this.getParent() && this.getParent().do_push_state) { @@ -874,7 +874,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ var view = this.getParent(); this.sections = [ { 'name' : 'print', 'label' : _t('Print'), }, - { 'name' : 'files', 'label' : _t('Attachment'), }, + { 'name' : 'files', 'label' : _t('Attachment(s)'), }, { 'name' : 'other', 'label' : _t('More'), } ]; this.items = { @@ -901,7 +901,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ var self = this; this._super(this); this.redraw(); - this.$element.on('click','.oe_dropdown_menu li a', function(event) { + this.$el.on('click','.oe_dropdown_menu li a', function(event) { var section = $(this).data('section'); var index = $(this).data('index'); var item = self.items[section][index]; @@ -917,7 +917,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ }, redraw: function() { var self = this; - self.$element.html(QWeb.render('Sidebar', {widget: self})); + self.$el.html(QWeb.render('Sidebar', {widget: self})); // Hides Sidebar sections when item list is empty this.$('.oe_form_dropdown_section').each(function() { @@ -1024,12 +1024,12 @@ instance.web.Sidebar = instance.web.Widget.extend({ self.items['files'] = attachments; self.redraw(); this.$('.oe_sidebar_add_attachment .oe_form_binary_file').change(this.on_attachment_changed); - this.$element.find('.oe_sidebar_delete_item').click(this.on_attachment_delete); + this.$el.find('.oe_sidebar_delete_item').click(this.on_attachment_delete); }, on_attachment_changed: function(e) { var $e = $(e.target); if ($e.val() !== '') { - this.$element.find('form.oe_form_binary_form').submit(); + this.$el.find('form.oe_form_binary_form').submit(); $e.parent().find('input[type=file]').prop('disabled', true); $e.parent().find('button').prop('disabled', true).find('img, span').toggle(); this.$('.oe_sidebar_add_attachment span').text(_t('Uploading...')); @@ -1078,8 +1078,8 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({ var self = this; this._super(); $.when(this.languages_loaded).then(function() { - self.$element.html(instance.web.qweb.render('TranslateDialog', { widget: self })); - self.$fields_form = self.$element.find('.oe_translation_form'); + self.$el.html(instance.web.qweb.render('TranslateDialog', { widget: self })); + self.$fields_form = self.$el.find('.oe_translation_form'); self.$fields_form.find('.oe_trad_field').change(function() { $(this).toggleClass('touched', ($(this).val() != $(this).attr('data-value'))); }); @@ -1125,8 +1125,8 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({ if (self.view.translatable_fields && self.view.translatable_fields.length) { self.do_load_fields_values(function() { if (field) { - var $field_input = self.$element.find('tr[data-field="' + field.name + '"] td:nth-child(2) *:first-child'); - self.$element.scrollTo($field_input); + var $field_input = self.$el.find('tr[data-field="' + field.name + '"] td:nth-child(2) *:first-child'); + self.$el.scrollTo($field_input); $field_input.focus(); } }); @@ -1302,10 +1302,10 @@ instance.web.View = instance.web.Widget.extend({ this.embedded_view = embedded_view; }, do_show: function () { - this.$element.show(); + this.$el.show(); }, do_hide: function () { - this.$element.hide(); + this.$el.hide(); }, do_push_state: function(state) { if (this.getParent() && this.getParent().do_push_state) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c91c156a2c4..8478ffeda22 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -51,29 +51,6 @@ </table> </t> <t t-name="CrashManager.error"> - <t t-if="!session.openerp_entreprise"> - <span>Your version of OpenERP is unsupported. Support & maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span> - </t> - <t t-if="session.openerp_entreprise"> - <div class="oe_error_send"> - <div> - <div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div> - <div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/> - <div> - <label>Summary:</label><br/> - <input id="issuename" type="text" class="oe_fielddiv"/> - </div><br/><br/> - <div> - <label>Description:</label><br/> - <textarea id="explanation" rows="6"></textarea> - </div><br/><br/> - <div> - <label>What you did:</label><br/> - <textarea id="remark" rows="6" ></textarea> - </div> - </div> - </div><br/> - </t> <div class="oe_error_detail"> <pre><t t-esc="error.message"/></pre> <hr/> @@ -563,6 +540,7 @@ <t t-foreach="widget.sections" t-as="section"> <div class="oe_form_dropdown_section"> <button class="oe_dropdown_toggle oe_dropdown_arrow"> + <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/> <t t-esc="section.label"/> </button> <ul class="oe_dropdown_menu"> @@ -1736,7 +1714,7 @@ <div class="oe_blockui_spin" style="height: 50px"> </div> <br /> - <div style="color:white">Loading...</div> + <div class="oe_throbber_message" style="color:white"></div> </div> </t> </templates> diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js index 100b1fa6633..102a7d94d29 100644 --- a/addons/web/static/test/Widget.js +++ b/addons/web/static/test/Widget.js @@ -86,17 +86,17 @@ $(document).ready(function () { test('no template, default', function () { var w = new (instance.web.Widget.extend({ })); - var $original = w.$element; + var $original = w.$el; ok($original, "should initially have a root element"); w.renderElement(); - ok(w.$element, "should have generated a root element"); - ok($original !== w.$element, "should have generated a new root element"); - strictEqual(w.$element, w.$element, "should provide $element alias"); - ok(w.$element.is(w.el), "should provide raw DOM alias"); + ok(w.$el, "should have generated a root element"); + ok($original !== w.$el, "should have generated a new root element"); + strictEqual(w.$el, w.$el, "should provide $el alias"); + ok(w.$el.is(w.el), "should provide raw DOM alias"); equal(w.el.nodeName, 'DIV', "should have generated the default element"); equal(w.el.attributes.length, 0, "should not have generated any attribute"); - ok(_.isEmpty(w.$element.html(), "should not have generated any content")); + ok(_.isEmpty(w.$el.html(), "should not have generated any content")); }); test('no template, custom tag', function () { var w = new (instance.web.Widget.extend({ @@ -113,7 +113,7 @@ $(document).ready(function () { w.renderElement(); equal(w.el.attributes.length, 1, "should have one attribute"); - equal(w.$element.attr('id'), 'foo', "should have generated the id attribute"); + equal(w.$el.attr('id'), 'foo', "should have generated the id attribute"); equal(w.el.id, 'foo', "should also be available via property"); }); test('no template, @className', function () { @@ -123,7 +123,7 @@ $(document).ready(function () { w.renderElement(); equal(w.el.className, 'oe_some_class', "should have the right property"); - equal(w.$element.attr('class'), 'oe_some_class', "should have the right attribute"); + equal(w.$el.attr('class'), 'oe_some_class', "should have the right attribute"); }); test('no template, bunch of attributes', function () { var w = new (instance.web.Widget.extend({ @@ -140,16 +140,16 @@ $(document).ready(function () { equal(w.el.attributes.length, 5, "should have all the specified attributes"); equal(w.el.id, 'some_id'); - equal(w.$element.attr('id'), 'some_id'); + equal(w.$el.attr('id'), 'some_id'); equal(w.el.className, 'some_class'); - equal(w.$element.attr('class'), 'some_class'); + equal(w.$el.attr('class'), 'some_class'); - equal(w.$element.attr('data-foo'), 'data attribute'); - equal(w.$element.data('foo'), 'data attribute'); + equal(w.$el.attr('data-foo'), 'data attribute'); + equal(w.$el.data('foo'), 'data attribute'); - equal(w.$element.attr('clark'), 'gable'); - equal(w.$element.attr('spoiler'), 'snape kills dumbledore'); + equal(w.$el.attr('clark'), 'gable'); + equal(w.$el.attr('spoiler'), 'snape kills dumbledore'); }); test('template', function () { @@ -159,7 +159,7 @@ $(document).ready(function () { w.renderElement(); equal(w.el.nodeName, 'OL'); - equal(w.$element.children().length, 5); + equal(w.$el.children().length, 5); equal(w.el.textContent, '01234'); }); @@ -170,7 +170,7 @@ $(document).ready(function () { })); w.renderElement(); - ok(w.$('li:eq(3)').is(w.$element.find('li:eq(3)')), + ok(w.$('li:eq(3)').is(w.$el.find('li:eq(3)')), "should do the same thing as calling find on the widget root"); }); @@ -191,7 +191,7 @@ $(document).ready(function () { })); w.renderElement(); - w.$element.click(); + w.$el.click(); w.$('li:eq(3)').click(); w.$('input:last').val('foo').change(); @@ -206,7 +206,7 @@ $(document).ready(function () { events: { 'click li': function () { clicked = true; } } })); w.renderElement(); - w.$element.on('click', 'li', function () { newclicked = true }); + w.$el.on('click', 'li', function () { newclicked = true }); w.$('li').click(); ok(clicked, "should trigger bound events"); @@ -229,11 +229,11 @@ $(document).ready(function () { .always(start) .done(function () { equal($fix.find('p').text(), '42', "DOM fixture should contain initial value"); - equal(w.$element.text(), '42', "should set initial value"); + equal(w.$el.text(), '42', "should set initial value"); w.value = 36; w.renderElement(); equal($fix.find('p').text(), '36', "DOM fixture should use new value"); - equal(w.$element.text(), '36', "should set new value"); + equal(w.$el.text(), '36', "should set new value"); }); }); }); diff --git a/addons/web/test_support/controllers.py b/addons/web/test_support/controllers.py index a3719070730..f1013fbaaf8 100644 --- a/addons/web/test_support/controllers.py +++ b/addons/web/test_support/controllers.py @@ -39,5 +39,4 @@ class TestSession(Session): "context": CONTEXT, "db": req.session._db, "login": req.session._login, - "openerp_entreprise": False, } diff --git a/addons/web_api/__openerp__.py b/addons/web_api/__openerp__.py index efc99afb7a9..a294719aaa6 100644 --- a/addons/web_api/__openerp__.py +++ b/addons/web_api/__openerp__.py @@ -1,10 +1,14 @@ { - "name" : "OpenERP Web API", - "category" : "Hidden", - "description":"""Openerp Web API.""", - "version" : "2.0", - "depends" : ['web'], - "installable" : True, + 'name': 'OpenERP Web API', + 'category': 'Hidden', + 'description': """ +Openerp Web API. +================ + +""", + 'version': '2.0', + 'depends': ['web'], + 'installable': True, 'auto_install': False, 'js' : [ ], diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py index 807d7927dc0..86b971976f9 100644 --- a/addons/web_calendar/__openerp__.py +++ b/addons/web_calendar/__openerp__.py @@ -1,20 +1,24 @@ { - "name": "Web Calendar", - "category": "Hidden", - "description":"""OpenERP Web Calendar view.""", - "version": "2.0", - "depends": ['web'], - "js": [ + 'name': 'Web Calendar', + 'category': 'Hidden', + 'description':""" +OpenERP Web Calendar view. +========================== + +""", + 'version': '2.0', + 'depends': ['web'], + 'js': [ 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js', 'static/lib/dhtmlxScheduler/sources/ext/ext_minical.js', 'static/src/js/calendar.js' ], - "css": [ - 'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css', - 'static/src/css/web_calendar.css' - ], + 'css': [ + 'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css', + 'static/src/css/web_calendar.css' + ], 'qweb' : [ - "static/src/xml/*.xml", + 'static/src/xml/*.xml', ], 'auto_install': True } diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po index 81e043ba7d0..f56e63a89c3 100644 --- a/addons/web_calendar/i18n/ar.po +++ b/addons/web_calendar/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po index b83e12bac04..f18c3c006f0 100644 --- a/addons/web_calendar/i18n/bg.po +++ b/addons/web_calendar/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po index 4bea5f205cc..1f44b1abca8 100644 --- a/addons/web_calendar/i18n/bn.po +++ b/addons/web_calendar/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po index b5d88579952..fb8d9868939 100644 --- a/addons/web_calendar/i18n/bs.po +++ b/addons/web_calendar/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po index 568b793b050..c324615c80e 100644 --- a/addons/web_calendar/i18n/ca.po +++ b/addons/web_calendar/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po index 25d16697a67..8dbaac78404 100644 --- a/addons/web_calendar/i18n/cs.po +++ b/addons/web_calendar/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po index ff9f6ec2e62..c6e16c1c836 100644 --- a/addons/web_calendar/i18n/da.po +++ b/addons/web_calendar/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po index f950afcc5d2..84d538b7f72 100644 --- a/addons/web_calendar/i18n/de.po +++ b/addons/web_calendar/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po index 319a6466147..8402bd48fe7 100644 --- a/addons/web_calendar/i18n/en_AU.po +++ b/addons/web_calendar/i18n/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po index 5f5a7072bea..457139f53c2 100644 --- a/addons/web_calendar/i18n/en_GB.po +++ b/addons/web_calendar/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po index 44faf52cc5c..6287740a43b 100644 --- a/addons/web_calendar/i18n/es.po +++ b/addons/web_calendar/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po index 0157332cb07..2ed43f574c0 100644 --- a/addons/web_calendar/i18n/es_CL.po +++ b/addons/web_calendar/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po index dfa2d0cb6ff..baf058c57e7 100644 --- a/addons/web_calendar/i18n/es_CR.po +++ b/addons/web_calendar/i18n/es_CR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: es\n" #. openerp-web diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po index 5f101e04b86..4af3f9a2229 100644 --- a/addons/web_calendar/i18n/es_EC.po +++ b/addons/web_calendar/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po index e7bf39c578d..fc8fe2c4f82 100644 --- a/addons/web_calendar/i18n/et.po +++ b/addons/web_calendar/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po index 64ade15c45f..9a40efaafad 100644 --- a/addons/web_calendar/i18n/eu.po +++ b/addons/web_calendar/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po index cc440f21f52..389c14fe39d 100644 --- a/addons/web_calendar/i18n/fi.po +++ b/addons/web_calendar/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po index 8cee149aae5..e70cc3586dd 100644 --- a/addons/web_calendar/i18n/fr.po +++ b/addons/web_calendar/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po index ea2fb44f229..664f7548e0b 100644 --- a/addons/web_calendar/i18n/fr_CA.po +++ b/addons/web_calendar/i18n/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po index 41c8c21da9f..989ef771e00 100644 --- a/addons/web_calendar/i18n/gl.po +++ b/addons/web_calendar/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po index 9f80b34defc..ee9cf0f1f6f 100644 --- a/addons/web_calendar/i18n/hr.po +++ b/addons/web_calendar/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po index f122173cc6a..825875dcc72 100644 --- a/addons/web_calendar/i18n/id.po +++ b/addons/web_calendar/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po index 8dc1631d60e..dacf0833788 100644 --- a/addons/web_calendar/i18n/it.po +++ b/addons/web_calendar/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po index c121fb3233f..530114b73c8 100644 --- a/addons/web_calendar/i18n/ja.po +++ b/addons/web_calendar/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po index 183b42ca287..f20ad7e28d1 100644 --- a/addons/web_calendar/i18n/ka.po +++ b/addons/web_calendar/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po index 6915d6616d2..5ac301eacbb 100644 --- a/addons/web_calendar/i18n/mk.po +++ b/addons/web_calendar/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po index cc24417da6e..37c52160f41 100644 --- a/addons/web_calendar/i18n/mn.po +++ b/addons/web_calendar/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po index 167b4330c46..47039c57804 100644 --- a/addons/web_calendar/i18n/nb.po +++ b/addons/web_calendar/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po index 526a3b4a2da..be9030bbffd 100644 --- a/addons/web_calendar/i18n/nl.po +++ b/addons/web_calendar/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po index c1cd2211134..b41105adb5a 100644 --- a/addons/web_calendar/i18n/nl_BE.po +++ b/addons/web_calendar/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po index a07d1edd22d..09b4d5ff082 100644 --- a/addons/web_calendar/i18n/pl.po +++ b/addons/web_calendar/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po index 0ffff8230b0..93872d85362 100644 --- a/addons/web_calendar/i18n/pt.po +++ b/addons/web_calendar/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po index b571c95dd8a..15012793fd2 100644 --- a/addons/web_calendar/i18n/pt_BR.po +++ b/addons/web_calendar/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po index 7cbfe8ddebe..477e5ea6dba 100644 --- a/addons/web_calendar/i18n/ro.po +++ b/addons/web_calendar/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po index b20a97fcb73..a285c18a8a0 100644 --- a/addons/web_calendar/i18n/ru.po +++ b/addons/web_calendar/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po index 37ded47c3dd..13235b7f1f6 100644 --- a/addons/web_calendar/i18n/sk.po +++ b/addons/web_calendar/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po index d4845899cf2..bb9a766699a 100644 --- a/addons/web_calendar/i18n/sl.po +++ b/addons/web_calendar/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po index 391ac78a1d0..d5052c21a98 100644 --- a/addons/web_calendar/i18n/sq.po +++ b/addons/web_calendar/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po index 7e321881737..30df81c6547 100644 --- a/addons/web_calendar/i18n/sr@latin.po +++ b/addons/web_calendar/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po index 9e0d8f4f07d..ff31e17a3ae 100644 --- a/addons/web_calendar/i18n/sv.po +++ b/addons/web_calendar/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po index 54c613d0cec..df64a8e2a20 100644 --- a/addons/web_calendar/i18n/tr.po +++ b/addons/web_calendar/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po index eb7303b3791..04c7810aab4 100644 --- a/addons/web_calendar/i18n/uk.po +++ b/addons/web_calendar/i18n/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po index 93797a3cdc2..93c6e7fb8a9 100644 --- a/addons/web_calendar/i18n/zh_CN.po +++ b/addons/web_calendar/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 9feaf657e28..c3a9a25745e 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -49,7 +49,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ }, on_loaded: function(data) { this.fields_view = data; - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.addClass(this.fields_view.arch.attrs['class']); this.calendar_fields = {}; this.ids = this.dataset.ids; this.color_values = []; @@ -104,7 +104,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ if (!this.sidebar && this.options.$sidebar) { this.sidebar = new instance.web_calendar.Sidebar(this); - this.has_been_loaded.pipe(this.sidebar.appendTo(this.$element.find('.oe_calendar_sidebar_container'))); + this.has_been_loaded.pipe(this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container'))); } return this.has_been_loaded.resolve(); @@ -170,10 +170,10 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ } }; - scheduler.init(this.$element.find('.oe_calendar')[0], null, this.mode || 'month'); + scheduler.init(this.$el.find('.oe_calendar')[0], null, this.mode || 'month'); // Remove hard coded style attributes from dhtmlx scheduler - this.$element.find(".dhx_cal_navline div").removeAttr('style'); + this.$el.find(".dhx_cal_navline div").removeAttr('style'); scheduler.detachAllEvents(); scheduler.attachEvent('onEventAdded', this.do_create_event); @@ -186,7 +186,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ this.refresh_scheduler(); }, on_view_changed: function(mode, date) { - this.$element.find('.oe_calendar').removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode); + this.$el.find('.oe_calendar').removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode); if (!date.between(this.range_start, this.range_stop)) { this.update_range_dates(date); this.do_ranged_search(); @@ -313,7 +313,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ do_create_event_with_formdialog: function(event_id, event_obj) { var self = this; $.when(! self.form_dialog.dialog_inited ? self.form_dialog.init_dialog() : true).then(function() { - debugger; if (!event_obj) { event_obj = scheduler.getEvent(event_id); } @@ -429,7 +428,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ do_show: function () { var self = this; $.when(this.has_been_loaded).then(function() { - self.$element.show(); + self.$el.show(); self.do_push_state({}); }); }, @@ -452,7 +451,7 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({ this.form = new instance.web.FormView(this, this.dataset, this.view_id, { pager: false }); - var def = this.form.appendTo(this.$element); + var def = this.form.appendTo(this.$el); this.form.on_created.add_last(this.on_form_dialog_saved); this.form.on_saved.add_last(this.on_form_dialog_saved); this.form.on_button_cancel = function() { @@ -482,7 +481,7 @@ instance.web_calendar.Sidebar = instance.web.Widget.extend({ start: function() { this._super(); this.mini_calendar = scheduler.renderCalendar({ - container: this.$element.find('.oe_calendar_mini')[0], + container: this.$el.find('.oe_calendar_mini')[0], navigation: true, date: scheduler._date, handler: function(date, calendar) { @@ -490,7 +489,7 @@ instance.web_calendar.Sidebar = instance.web.Widget.extend({ } }); this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent()); - this.filter.appendTo(this.$element.find('.oe_calendar_filter')); + this.filter.appendTo(this.$el.find('.oe_calendar_filter')); } }); instance.web_calendar.SidebarFilter = instance.web.Widget.extend({ @@ -503,7 +502,7 @@ instance.web_calendar.SidebarFilter = instance.web.Widget.extend({ }, on_events_loaded: function(filters) { var selected_filters = this.view.selected_filters.slice(0); - this.$element.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters })); + this.$el.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters })); this.$('div.oe_calendar_responsible input').each(function() { if (_.indexOf(selected_filters, $(this).val()) > -1) { $(this).click(); diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index eda044f686f..71156411fe3 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -1,21 +1,25 @@ { - "name" : "OpenERP Web Diagram", - "category" : "Hidden", - "description":"""Openerp Web Diagram view.""", - "version" : "2.0", - "depends" : ["web"], - "js": [ + 'name': 'OpenERP Web Diagram', + 'category': 'Hidden', + 'description': """ +Openerp Web Diagram view. +========================= + +""", + 'version': '2.0', + 'depends': ['web'], + 'js': [ 'static/lib/js/raphael.js', 'static/lib/js/jquery.mousewheel.js', 'static/src/js/vec2.js', 'static/src/js/graph.js', 'static/src/js/diagram.js', ], - 'css' : [ - "static/src/css/base_diagram.css", + 'css': [ + 'static/src/css/base_diagram.css', ], - 'qweb' : [ - "static/src/xml/*.xml", + 'qweb': [ + 'static/src/xml/*.xml', ], 'auto_install': True, } diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po index aa3ae8af5b1..6cefaa2a1e6 100644 --- a/addons/web_diagram/i18n/ar.po +++ b/addons/web_diagram/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po index 20c833a6e74..4d9b09a32fd 100644 --- a/addons/web_diagram/i18n/bg.po +++ b/addons/web_diagram/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po index 28652b46dfe..c7c3098261a 100644 --- a/addons/web_diagram/i18n/bn.po +++ b/addons/web_diagram/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po index 21c7896e576..78bc9bcfed6 100644 --- a/addons/web_diagram/i18n/bs.po +++ b/addons/web_diagram/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po index 7a4e683e583..7bdff1f56ab 100644 --- a/addons/web_diagram/i18n/ca.po +++ b/addons/web_diagram/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po index ebe8d76ce29..8aa648c29d6 100644 --- a/addons/web_diagram/i18n/cs.po +++ b/addons/web_diagram/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po index cdaa7345bca..d43db3441ef 100644 --- a/addons/web_diagram/i18n/da.po +++ b/addons/web_diagram/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po index c69b5256fdd..2a712220960 100644 --- a/addons/web_diagram/i18n/de.po +++ b/addons/web_diagram/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po index 97146a46512..d77a4241a18 100644 --- a/addons/web_diagram/i18n/en_GB.po +++ b/addons/web_diagram/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po index c01b4f86693..bbf3b6fe1a1 100644 --- a/addons/web_diagram/i18n/es.po +++ b/addons/web_diagram/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po index ee83c5c6385..0ee04a2e1b3 100644 --- a/addons/web_diagram/i18n/es_CL.po +++ b/addons/web_diagram/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po index 7b03e9669f0..bc5a06f617b 100644 --- a/addons/web_diagram/i18n/es_CR.po +++ b/addons/web_diagram/i18n/es_CR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: es\n" #. openerp-web diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po index 2a21b744f43..02a71d4d443 100644 --- a/addons/web_diagram/i18n/es_EC.po +++ b/addons/web_diagram/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po index 55413cd7a7d..2dbaff93c81 100644 --- a/addons/web_diagram/i18n/et.po +++ b/addons/web_diagram/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po index 4a7b36c8394..5c7bf61c4f8 100644 --- a/addons/web_diagram/i18n/fi.po +++ b/addons/web_diagram/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po index 84a40fe37be..25c1d712ea8 100644 --- a/addons/web_diagram/i18n/fr.po +++ b/addons/web_diagram/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po index 4af30819269..387a3a9e176 100644 --- a/addons/web_diagram/i18n/gl.po +++ b/addons/web_diagram/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po index 4b335dddb5c..19c8beadb52 100644 --- a/addons/web_diagram/i18n/hr.po +++ b/addons/web_diagram/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po index 5543c8d127e..38e3f04dd2a 100644 --- a/addons/web_diagram/i18n/id.po +++ b/addons/web_diagram/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po index 490676cc10e..03452a70419 100644 --- a/addons/web_diagram/i18n/it.po +++ b/addons/web_diagram/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po index 8244f6136a3..0efa97a6739 100644 --- a/addons/web_diagram/i18n/ja.po +++ b/addons/web_diagram/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po index 83999c5b3d2..8244511d7f7 100644 --- a/addons/web_diagram/i18n/ka.po +++ b/addons/web_diagram/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po index 21d9b85a194..d16d11b84c5 100644 --- a/addons/web_diagram/i18n/mn.po +++ b/addons/web_diagram/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po index ca4a2c29bd0..c45161d6288 100644 --- a/addons/web_diagram/i18n/nl.po +++ b/addons/web_diagram/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po index 4a80d307fb8..05b7b85f9bf 100644 --- a/addons/web_diagram/i18n/nl_BE.po +++ b/addons/web_diagram/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po index 70a16def0c9..bd13e5de525 100644 --- a/addons/web_diagram/i18n/pl.po +++ b/addons/web_diagram/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po index 24c54f5dbbd..3f7fc4e682e 100644 --- a/addons/web_diagram/i18n/pt.po +++ b/addons/web_diagram/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po index 9a5b776cd11..47686c4d90e 100644 --- a/addons/web_diagram/i18n/pt_BR.po +++ b/addons/web_diagram/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po index 75e35add59b..230a60799c8 100644 --- a/addons/web_diagram/i18n/ro.po +++ b/addons/web_diagram/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po index 89a988b49da..c89a3df01b6 100644 --- a/addons/web_diagram/i18n/ru.po +++ b/addons/web_diagram/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po index 8be46d53966..e66bfe21025 100644 --- a/addons/web_diagram/i18n/sl.po +++ b/addons/web_diagram/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po index 2a45df6a62f..85f3c8ea3a5 100644 --- a/addons/web_diagram/i18n/sq.po +++ b/addons/web_diagram/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po index beafe88dbf3..06b504ef6b1 100644 --- a/addons/web_diagram/i18n/sr@latin.po +++ b/addons/web_diagram/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po index 0b20d56a50c..fcfea765727 100644 --- a/addons/web_diagram/i18n/sv.po +++ b/addons/web_diagram/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po index c0b76cf08c5..a7d5e594b0c 100644 --- a/addons/web_diagram/i18n/tr.po +++ b/addons/web_diagram/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po index e931ac4d03e..c716c0dca5a 100644 --- a/addons/web_diagram/i18n/zh_CN.po +++ b/addons/web_diagram/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 0bbfcd57523..657e68d6f06 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -47,15 +47,15 @@ instance.web.DiagramView = instance.web.View.extend({ return label.tag == "label"; }); - this.$element.html(QWeb.render("DiagramView", this)); - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.html(QWeb.render("DiagramView", this)); + this.$el.addClass(this.fields_view.arch.attrs['class']); _.each(self.labels,function(label){ html_label = '<p style="padding: 4px;">' + label.attrs.string + "</p>"; - self.$element.find('.oe_diagram_header').append(html_label); + self.$el.find('.oe_diagram_header').append(html_label); }) - this.$element.find('div.oe_diagram_pager button[data-pager-action]').click(function() { + this.$el.find('div.oe_diagram_pager button[data-pager-action]').click(function() { var action = $(this).data('pager-action'); self.on_pager_action(action); }); @@ -63,7 +63,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.do_update_pager(); // New Node,Edge - this.$element.find('#new_node.oe_diagram_button_new').click(function(){self.add_node();}); + this.$el.find('#new_node.oe_diagram_button_new').click(function(){self.add_node();}); if(this.id) { self.get_diagram_info(); @@ -126,7 +126,7 @@ instance.web.DiagramView = instance.web.View.extend({ var res_nodes = result['nodes']; var res_edges = result['conn']; this.parent_field = result.parent_field; - this.$element.find('h3.oe_diagram_title').text(result.name); + this.$el.find('h3.oe_diagram_title').text(result.name); var id_to_node = {}; @@ -161,7 +161,7 @@ instance.web.DiagramView = instance.web.View.extend({ }; // remove previous diagram - var canvas = self.$element.find('div.oe_diagram_diagram') + var canvas = self.$el.find('div.oe_diagram_diagram') .empty().get(0); var r = new Raphael(canvas, '100%','100%'); @@ -332,7 +332,7 @@ instance.web.DiagramView = instance.web.View.extend({ }); // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes. // This is not a problem since the diagram is completely redrawn on saved changes. - pop.$element.bind("dialogbeforeclose",function(){ + pop.$el.bind("dialogbeforeclose",function(){ if(dummy_cuteedge){ dummy_cuteedge.remove(); } @@ -370,7 +370,7 @@ instance.web.DiagramView = instance.web.View.extend({ }, do_update_pager: function(hide_index) { - var $pager = this.$element.find('div.oe_diagram_pager'); + var $pager = this.$el.find('div.oe_diagram_pager'); var index = hide_index ? '-' : this.dataset.index + 1; if(!this.dataset.count) { this.dataset.count = this.dataset.ids.length; diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py index 09528016c4c..3fef67a55f6 100644 --- a/addons/web_gantt/__openerp__.py +++ b/addons/web_gantt/__openerp__.py @@ -1,17 +1,21 @@ { - "name": "Web Gantt", - "category": "Hidden", - "description":"""OpenERP Web Gantt chart view.""", - "version": "2.0", - "depends": ['web'], - "js": [ + 'name': 'Web Gantt', + 'category': 'Hidden', + 'description': """ +OpenERP Web Gantt chart view. +============================= + +""", + 'version': '2.0', + 'depends': ['web'], + 'js': [ 'static/lib/dhtmlxGantt/sources/dhtmlxcommon.js', 'static/lib/dhtmlxGantt/sources/dhtmlxgantt.js', 'static/src/js/gantt.js' ], - "css": ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'], - 'qweb' : [ - "static/src/xml/*.xml", + 'css': ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'], + 'qweb': [ + 'static/src/xml/*.xml', ], 'auto_install': True } diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po index d5eef7a92db..1424a611755 100644 --- a/addons/web_gantt/i18n/ar.po +++ b/addons/web_gantt/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po index 6eb9f08d8ab..03fd70a4022 100644 --- a/addons/web_gantt/i18n/bg.po +++ b/addons/web_gantt/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po index 1c4dfc05717..5fbfd0d559d 100644 --- a/addons/web_gantt/i18n/bn.po +++ b/addons/web_gantt/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po index 155467c9eb6..8c12629417c 100644 --- a/addons/web_gantt/i18n/bs.po +++ b/addons/web_gantt/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po index a375101d7ad..c0f595fa923 100644 --- a/addons/web_gantt/i18n/ca.po +++ b/addons/web_gantt/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po index 2fbf8a8e8ac..e99da0cc8a9 100644 --- a/addons/web_gantt/i18n/cs.po +++ b/addons/web_gantt/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po index 1aaea974b18..f21409b8c06 100644 --- a/addons/web_gantt/i18n/da.po +++ b/addons/web_gantt/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po index c4c831e072a..12b5919db12 100644 --- a/addons/web_gantt/i18n/de.po +++ b/addons/web_gantt/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po index 6acc18ffece..eaf33501cee 100644 --- a/addons/web_gantt/i18n/en_AU.po +++ b/addons/web_gantt/i18n/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po index 6a44584b01d..6806f550137 100644 --- a/addons/web_gantt/i18n/en_GB.po +++ b/addons/web_gantt/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po index 88d7a7d7910..8a93a2f06cb 100644 --- a/addons/web_gantt/i18n/es.po +++ b/addons/web_gantt/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po index 0d2babb4487..b690ab31964 100644 --- a/addons/web_gantt/i18n/es_CL.po +++ b/addons/web_gantt/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po index 490ee224753..690c28f19d3 100644 --- a/addons/web_gantt/i18n/es_CR.po +++ b/addons/web_gantt/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po index b26be492ccb..fc8d6585ff3 100644 --- a/addons/web_gantt/i18n/es_EC.po +++ b/addons/web_gantt/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po index 38acb800e1b..52ba352cd3d 100644 --- a/addons/web_gantt/i18n/fi.po +++ b/addons/web_gantt/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po index 0a6993e21b7..af575c4ceb5 100644 --- a/addons/web_gantt/i18n/fr.po +++ b/addons/web_gantt/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po index 4ea43a3df49..18eff9bbe87 100644 --- a/addons/web_gantt/i18n/gl.po +++ b/addons/web_gantt/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po index 92030903799..efcdb158786 100644 --- a/addons/web_gantt/i18n/hr.po +++ b/addons/web_gantt/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po index da177e4c3ce..ba638e6f53f 100644 --- a/addons/web_gantt/i18n/hu.po +++ b/addons/web_gantt/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po index 0fab5d5a67c..596d2c10b23 100644 --- a/addons/web_gantt/i18n/it.po +++ b/addons/web_gantt/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po index 45fe347017d..fdae6e9856f 100644 --- a/addons/web_gantt/i18n/ja.po +++ b/addons/web_gantt/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po index 93351230585..0d8d78bbcd9 100644 --- a/addons/web_gantt/i18n/ka.po +++ b/addons/web_gantt/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po index 7d4bf2c85b5..0c2e2a7b10a 100644 --- a/addons/web_gantt/i18n/mk.po +++ b/addons/web_gantt/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po index 83b74b93b6e..0816e5c3801 100644 --- a/addons/web_gantt/i18n/mn.po +++ b/addons/web_gantt/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po index c0a448ffcba..b0b11fe866d 100644 --- a/addons/web_gantt/i18n/nb.po +++ b/addons/web_gantt/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po index 1554a311556..5009a0cd4da 100644 --- a/addons/web_gantt/i18n/nl.po +++ b/addons/web_gantt/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po index 5f06bc13bd4..4900b1ad510 100644 --- a/addons/web_gantt/i18n/nl_BE.po +++ b/addons/web_gantt/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po index 42db7e3e2f4..67903e79479 100644 --- a/addons/web_gantt/i18n/pl.po +++ b/addons/web_gantt/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po index d24d586b90f..5b81c8dffde 100644 --- a/addons/web_gantt/i18n/pt.po +++ b/addons/web_gantt/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po index 6a20c79dc3e..d454b7f761d 100644 --- a/addons/web_gantt/i18n/pt_BR.po +++ b/addons/web_gantt/i18n/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po index dcf8825c5f2..2064fe9d085 100644 --- a/addons/web_gantt/i18n/ro.po +++ b/addons/web_gantt/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po index 77741297e0e..0fab8d95ab9 100644 --- a/addons/web_gantt/i18n/ru.po +++ b/addons/web_gantt/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po index b9b114accb8..68dc4eecb99 100644 --- a/addons/web_gantt/i18n/sl.po +++ b/addons/web_gantt/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po index 35f0bdb1432..14e0802e404 100644 --- a/addons/web_gantt/i18n/sq.po +++ b/addons/web_gantt/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po index f2bbeaee08a..da3ffe07e69 100644 --- a/addons/web_gantt/i18n/sr@latin.po +++ b/addons/web_gantt/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po index 865ecab1cef..561c9ea9263 100644 --- a/addons/web_gantt/i18n/sv.po +++ b/addons/web_gantt/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po index 5bc0434bb29..a88b14b1619 100644 --- a/addons/web_gantt/i18n/tr.po +++ b/addons/web_gantt/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po index f3d209bcf15..58c7b37ed9c 100644 --- a/addons/web_gantt/i18n/zh_CN.po +++ b/addons/web_gantt/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_gantt/static/src/js/gantt.js:11 diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 202fb2aecc6..5b29be07450 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -19,7 +19,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ on_loaded: function(fields_view_get, fields_get) { var self = this; this.fields_view = fields_view_get; - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.addClass(this.fields_view.arch.attrs['class']); return this.rpc("/web/searchview/fields_get", {"model": this.dataset.model}).pipe(function(fields_get) { self.fields = fields_get.fields; self.has_been_loaded.resolve(); @@ -69,7 +69,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ }, on_data_loaded_2: function(tasks, group_bys) { var self = this; - $(".oe_gantt", this.$element).html(""); + $(".oe_gantt", this.$el).html(""); //prevent more that 1 group by if (group_bys.length > 0) { @@ -177,7 +177,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ gantt.create(this.chart_id); // bind event to display task when we click the item in the tree - $(".taskNameItem", self.$element).click(function(event) { + $(".taskNameItem", self.$el).click(function(event) { var task_info = task_ids[event.target.id]; if (task_info) { self.on_task_display(task_info.internal_task); @@ -185,10 +185,10 @@ instance.web_gantt.GanttView = instance.web.View.extend({ }); // insertion of create button - var td = $($("table td", self.$element)[0]); + var td = $($("table td", self.$el)[0]); var rendered = QWeb.render("GanttView-create-button"); $(rendered).prependTo(td); - $(".oe_gantt_button_create", this.$element).click(this.on_task_create); + $(".oe_gantt_button_create", this.$el).click(this.on_task_create); }, on_task_changed: function(task_obj) { var self = this; diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py index 31c66863ebf..c62a1877ee0 100644 --- a/addons/web_graph/__openerp__.py +++ b/addons/web_graph/__openerp__.py @@ -1,7 +1,7 @@ { - "name": "Graph Views", - "category" : "Hidden", - "description":""" + 'name': 'Graph Views', + 'category': 'Hidden', + 'description': """ Graph Views for Web Client. =========================== @@ -12,47 +12,47 @@ Graph Views for Web Client. * Features: download as PNG or CSV, browse data grid, switch orientation * Unlimited "Group By" levels (not stacked), two cross level analysis (stacked) """, - "version": "3.0", - "depends": ['web'], - "js": [ - "static/lib/dropdown.js", - "static/lib/flotr2/lib/bean.js", - "static/lib/flotr2/js/Flotr.js", - "static/lib/flotr2/js/DefaultOptions.js", - "static/lib/flotr2/js/Color.js", - "static/lib/flotr2/js/Date.js", - "static/lib/flotr2/js/DOM.js", - "static/lib/flotr2/js/EventAdapter.js", - "static/lib/flotr2/js/Text.js", - "static/lib/flotr2/js/Graph.js", - "static/lib/flotr2/js/Axis.js", - "static/lib/flotr2/js/Series.js", - "static/lib/flotr2/js/types/lines.js", - "static/lib/flotr2/js/types/bars.js", - "static/lib/flotr2/js/types/bubbles.js", - "static/lib/flotr2/js/types/candles.js", - "static/lib/flotr2/js/types/gantt.js", - "static/lib/flotr2/js/types/markers.js", - "static/lib/flotr2/js/types/pie.js", - "static/lib/flotr2/js/types/points.js", - "static/lib/flotr2/js/types/radar.js", - "static/lib/flotr2/js/types/timeline.js", - "static/lib/flotr2/js/plugins/crosshair.js", - "static/lib/flotr2/js/plugins/download.js", - "static/lib/flotr2/js/plugins/grid.js", - "static/lib/flotr2/js/plugins/hit.js", - "static/lib/flotr2/js/plugins/selection.js", - "static/lib/flotr2/js/plugins/labels.js", - "static/lib/flotr2/js/plugins/legend.js", - "static/lib/flotr2/js/plugins/spreadsheet.js", - "static/lib/flotr2/js/plugins/titles.js", - "static/src/js/graph.js" + 'version': '3.0', + 'depends': ['web'], + 'js': [ + 'static/lib/dropdown.js', + 'static/lib/flotr2/lib/bean.js', + 'static/lib/flotr2/js/Flotr.js', + 'static/lib/flotr2/js/DefaultOptions.js', + 'static/lib/flotr2/js/Color.js', + 'static/lib/flotr2/js/Date.js', + 'static/lib/flotr2/js/DOM.js', + 'static/lib/flotr2/js/EventAdapter.js', + 'static/lib/flotr2/js/Text.js', + 'static/lib/flotr2/js/Graph.js', + 'static/lib/flotr2/js/Axis.js', + 'static/lib/flotr2/js/Series.js', + 'static/lib/flotr2/js/types/lines.js', + 'static/lib/flotr2/js/types/bars.js', + 'static/lib/flotr2/js/types/bubbles.js', + 'static/lib/flotr2/js/types/candles.js', + 'static/lib/flotr2/js/types/gantt.js', + 'static/lib/flotr2/js/types/markers.js', + 'static/lib/flotr2/js/types/pie.js', + 'static/lib/flotr2/js/types/points.js', + 'static/lib/flotr2/js/types/radar.js', + 'static/lib/flotr2/js/types/timeline.js', + 'static/lib/flotr2/js/plugins/crosshair.js', + 'static/lib/flotr2/js/plugins/download.js', + 'static/lib/flotr2/js/plugins/grid.js', + 'static/lib/flotr2/js/plugins/hit.js', + 'static/lib/flotr2/js/plugins/selection.js', + 'static/lib/flotr2/js/plugins/labels.js', + 'static/lib/flotr2/js/plugins/legend.js', + 'static/lib/flotr2/js/plugins/spreadsheet.js', + 'static/lib/flotr2/js/plugins/titles.js', + 'static/src/js/graph.js' ], - "css": [ - "static/src/css/*.css", + 'css': [ + 'static/src/css/*.css', ], 'qweb' : [ - "static/src/xml/*.xml", + 'static/src/xml/*.xml', ], - "auto_install": True + 'auto_install': True } diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po index 7bc29fb9f54..a604c1c5181 100644 --- a/addons/web_graph/i18n/ar.po +++ b/addons/web_graph/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po index a4b50e81df7..f2c65aef06c 100644 --- a/addons/web_graph/i18n/bg.po +++ b/addons/web_graph/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po index 4d6ba634835..3446708f8c7 100644 --- a/addons/web_graph/i18n/bn.po +++ b/addons/web_graph/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po index 987fd2f305d..fe69ca74cda 100644 --- a/addons/web_graph/i18n/bs.po +++ b/addons/web_graph/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po index 6c7ded6fa9c..7c12d4e4a5b 100644 --- a/addons/web_graph/i18n/ca.po +++ b/addons/web_graph/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po index ba07fc36350..f859e927649 100644 --- a/addons/web_graph/i18n/cs.po +++ b/addons/web_graph/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po index 5fa8dbc2233..4b7554491ba 100644 --- a/addons/web_graph/i18n/da.po +++ b/addons/web_graph/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po index ce33aed9eb4..ad047080026 100644 --- a/addons/web_graph/i18n/de.po +++ b/addons/web_graph/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po index 240244f0bf2..c8bf729f812 100644 --- a/addons/web_graph/i18n/en_AU.po +++ b/addons/web_graph/i18n/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po index 0b1eb8e8563..cf620b69f30 100644 --- a/addons/web_graph/i18n/en_GB.po +++ b/addons/web_graph/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po index 953b0aa8442..830a3578103 100644 --- a/addons/web_graph/i18n/es.po +++ b/addons/web_graph/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po index 4c18cbdf028..578a92e24b1 100644 --- a/addons/web_graph/i18n/es_CL.po +++ b/addons/web_graph/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po index 937825e9e87..419d34825a0 100644 --- a/addons/web_graph/i18n/es_CR.po +++ b/addons/web_graph/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po index 4594f8fb9ae..c6e16670cbc 100644 --- a/addons/web_graph/i18n/es_EC.po +++ b/addons/web_graph/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po index 8e0464cebbf..e5feb98e938 100644 --- a/addons/web_graph/i18n/fi.po +++ b/addons/web_graph/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po index d7c0e21ad4b..1e1da78fe94 100644 --- a/addons/web_graph/i18n/fr.po +++ b/addons/web_graph/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po index 7e7da56c039..b0da79d0b3a 100644 --- a/addons/web_graph/i18n/gl.po +++ b/addons/web_graph/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po index 20f23190c87..26f93bddfcb 100644 --- a/addons/web_graph/i18n/hr.po +++ b/addons/web_graph/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po index 16551a88c47..3e5ffe677cc 100644 --- a/addons/web_graph/i18n/hu.po +++ b/addons/web_graph/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po index 973f21d0443..c79df04df01 100644 --- a/addons/web_graph/i18n/it.po +++ b/addons/web_graph/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po index 26c87813665..e4be5e7f545 100644 --- a/addons/web_graph/i18n/ja.po +++ b/addons/web_graph/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po index 388a72fbd3f..4320bcd0b79 100644 --- a/addons/web_graph/i18n/ka.po +++ b/addons/web_graph/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po index 94c6168e714..e99960e7d65 100644 --- a/addons/web_graph/i18n/mk.po +++ b/addons/web_graph/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po index 09ba40fc2a8..e0a1bc889f0 100644 --- a/addons/web_graph/i18n/mn.po +++ b/addons/web_graph/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po index bf561554cf0..6bbc4004161 100644 --- a/addons/web_graph/i18n/nl.po +++ b/addons/web_graph/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po index c8b1848711c..4d404eba722 100644 --- a/addons/web_graph/i18n/nl_BE.po +++ b/addons/web_graph/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po index e2288e2ce36..238559ed66f 100644 --- a/addons/web_graph/i18n/pl.po +++ b/addons/web_graph/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po index 67689e393bc..36f23acfa05 100644 --- a/addons/web_graph/i18n/pt.po +++ b/addons/web_graph/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po index bbc56f6c5b8..8d56215ecdb 100644 --- a/addons/web_graph/i18n/pt_BR.po +++ b/addons/web_graph/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po index 731642e222a..56295e0eddb 100644 --- a/addons/web_graph/i18n/ro.po +++ b/addons/web_graph/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po index 7466cb72fa3..351025ae719 100644 --- a/addons/web_graph/i18n/ru.po +++ b/addons/web_graph/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po index 2065e62e588..ccc87d073e2 100644 --- a/addons/web_graph/i18n/sl.po +++ b/addons/web_graph/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po index 6971309d47a..eb4dd6f9714 100644 --- a/addons/web_graph/i18n/sq.po +++ b/addons/web_graph/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po index 90e541ff5c5..203ea75fc0c 100644 --- a/addons/web_graph/i18n/sr@latin.po +++ b/addons/web_graph/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po index 9578d80a423..dd2c8c1a83d 100644 --- a/addons/web_graph/i18n/sv.po +++ b/addons/web_graph/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po index eb26136eed3..ec9a1140f17 100644 --- a/addons/web_graph/i18n/tr.po +++ b/addons/web_graph/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po index 1ecb36d972f..cbe82598c17 100644 --- a/addons/web_graph/i18n/zh_CN.po +++ b/addons/web_graph/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 2dfe0202cfc..b3fef54d094 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -53,20 +53,20 @@ instance.web_graph.GraphView = instance.web.View.extend({ // TODO: move to load_view and document var self = this; this.fields_view = fields_view_get; - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.addClass(this.fields_view.arch.attrs['class']); this.mode = this.fields_view.arch.attrs.type || 'bar'; this.orientation = this.fields_view.arch.attrs.orientation == 'horizontal'; - var width = this.$element.parent().width(); - this.$element.css("width", width); - this.container = this.$element.find("#editor-render-body").css({ + var width = this.$el.parent().width(); + this.$el.css("width", width); + this.container = this.$el.find("#editor-render-body").css({ width: width, height: Math.min(500, width * 0.8) })[0]; var graph_render = this.proxy('graph_render'); - this.$element.on('click', '.oe_graph_options a', function (evt) { + this.$el.on('click', '.oe_graph_options a', function (evt) { var $el = $(evt.target); self.graph_render({data: filter_values({ @@ -77,18 +77,18 @@ instance.web_graph.GraphView = instance.web.View.extend({ })}); }); - this.$element.find("#graph_show_data").click(function () { + this.$el.find("#graph_show_data").click(function () { self.spreadsheet = ! self.spreadsheet; self.graph_render(); }); - this.$element.find("#graph_switch").click(function () { + this.$el.find("#graph_switch").click(function () { if (self.mode != 'radar') { self.orientation = ! self.orientation; } self.graph_render(); }); - this.$element.find("#graph_download").click(function () { + this.$el.find("#graph_download").click(function () { if (self.legend == "top") { self.legend = "inside"; } self.forcehtml = true; @@ -110,7 +110,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ switch (this.legend) { case 'top': legend.noColumns = 4; - legend.container = this.$element.find("div.graph_header_legend")[0]; + legend.container = this.$el.find("div.graph_header_legend")[0]; break; case 'inside': legend.position = 'nw'; @@ -257,24 +257,24 @@ instance.web_graph.GraphView = instance.web.View.extend({ } // Render the graph - this.$element.find(".graph_header_legend").children().remove(); + this.$el.find(".graph_header_legend").children().remove(); this.graph = this.make_graph(this.mode, this.container, data); // Update styles of menus - this.$element.find("a").removeClass("active"); + this.$el.find("a").removeClass("active"); - var $active = this.$element.find('a[data-mode=' + this.mode + ']'); + var $active = this.$el.find('a[data-mode=' + this.mode + ']'); if ($active.length > 1) { $active = $active.filter('[data-stacked=' + this.stacked + ']'); } $active = $active.add( - this.$element.find('a:not([data-mode])[data-legend=' + this.legend + ']')); + this.$el.find('a:not([data-mode])[data-legend=' + this.legend + ']')); $active.addClass('active'); if (this.spreadsheet) { - this.$element.find("#graph_show_data").addClass("active"); + this.$el.find("#graph_show_data").addClass("active"); } return this.graph; }, diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py index 0c733fb6b64..5d8a4baf597 100644 --- a/addons/web_hello/__openerp__.py +++ b/addons/web_hello/__openerp__.py @@ -1,11 +1,15 @@ { - "name": "Hello", - "category": "Hidden", - "description":"""OpenERP Web example module.""", - "version": "2.0", - "depends": [], - "js": ["static/*/*.js", "static/*/js/*.js"], - "css": [], + 'name': 'Hello', + 'category': 'Hidden', + 'description':""" +OpenERP Web example module. +=========================== + +""", + 'version': '2.0', + 'depends': [], + 'js': ['static/*/*.js', 'static/*/js/*.js'], + 'css': [], 'auto_install': False, 'web_preload': False, } diff --git a/addons/web_hello/i18n/es_CR.po b/addons/web_hello/i18n/es_CR.po index 6af81878329..6eab78acf41 100644 --- a/addons/web_hello/i18n/es_CR.po +++ b/addons/web_hello/i18n/es_CR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" diff --git a/addons/web_hello/i18n/fr.po b/addons/web_hello/i18n/fr.po index 9bd64e064df..869d0ee429c 100644 --- a/addons/web_hello/i18n/fr.po +++ b/addons/web_hello/i18n/fr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" diff --git a/addons/web_hello/i18n/pt_BR.po b/addons/web_hello/i18n/pt_BR.po index 6b46afa5724..67290686615 100644 --- a/addons/web_hello/i18n/pt_BR.po +++ b/addons/web_hello/i18n/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py index d283acfe91f..233a35a04d2 100644 --- a/addons/web_kanban/__openerp__.py +++ b/addons/web_kanban/__openerp__.py @@ -1,17 +1,21 @@ { - "name" : "Base Kanban", - "category": "Hidden", - "description":"""OpenERP Web kanban view.""", - "version" : "2.0", - "depends" : ["web"], - "js": [ - "static/src/js/kanban.js" + 'name': 'Base Kanban', + 'category': 'Hidden', + 'description': """ +OpenERP Web kanban view. +======================== + +""", + 'version': '2.0', + 'depends': ['web'], + 'js': [ + 'static/src/js/kanban.js' ], - "css": [ - "static/src/css/kanban.css" + 'css': [ + 'static/src/css/kanban.css' ], 'qweb' : [ - "static/src/xml/*.xml", + 'static/src/xml/*.xml', ], 'auto_install': True } diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po index a827eb6540e..c9ae855e476 100644 --- a/addons/web_kanban/i18n/ar.po +++ b/addons/web_kanban/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po index 50c4d1d444b..7dcf4fa77a7 100644 --- a/addons/web_kanban/i18n/bg.po +++ b/addons/web_kanban/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po index e9eea4fefd7..37287eab6f8 100644 --- a/addons/web_kanban/i18n/bn.po +++ b/addons/web_kanban/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po index b4b41a46f95..d0a21ac4c2a 100644 --- a/addons/web_kanban/i18n/bs.po +++ b/addons/web_kanban/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po index 6e16a8fb30f..007e778a085 100644 --- a/addons/web_kanban/i18n/ca.po +++ b/addons/web_kanban/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po index 99a5025b177..bd337268145 100644 --- a/addons/web_kanban/i18n/cs.po +++ b/addons/web_kanban/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po index 1c822582c43..ee6bd4a1ac6 100644 --- a/addons/web_kanban/i18n/da.po +++ b/addons/web_kanban/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po index 4d52f859fcf..4fedf032dc0 100644 --- a/addons/web_kanban/i18n/de.po +++ b/addons/web_kanban/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po index 26cf16d5a92..a2081a7a251 100644 --- a/addons/web_kanban/i18n/en_GB.po +++ b/addons/web_kanban/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po index 73732801baf..d53fb2d91db 100644 --- a/addons/web_kanban/i18n/es.po +++ b/addons/web_kanban/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po index bce19d9674e..a924b1031bb 100644 --- a/addons/web_kanban/i18n/es_CL.po +++ b/addons/web_kanban/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po index a16ee53ccc9..241fb526906 100644 --- a/addons/web_kanban/i18n/es_CR.po +++ b/addons/web_kanban/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po index d879af6f7bc..4a145f58d66 100644 --- a/addons/web_kanban/i18n/es_EC.po +++ b/addons/web_kanban/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po index a28844c76df..97d61a1b6b0 100644 --- a/addons/web_kanban/i18n/fi.po +++ b/addons/web_kanban/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po index d49eedc7f3a..f9bb957dacd 100644 --- a/addons/web_kanban/i18n/fr.po +++ b/addons/web_kanban/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po index 0f5f84a90b6..4282a631bbe 100644 --- a/addons/web_kanban/i18n/gl.po +++ b/addons/web_kanban/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po index fb8d1f51e4b..aefd933df50 100644 --- a/addons/web_kanban/i18n/hr.po +++ b/addons/web_kanban/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po index 67b72076833..220355bae8e 100644 --- a/addons/web_kanban/i18n/hu.po +++ b/addons/web_kanban/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po index e09a0c5672c..47ea9c05964 100644 --- a/addons/web_kanban/i18n/it.po +++ b/addons/web_kanban/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po index 0e2278c2853..e85cca47689 100644 --- a/addons/web_kanban/i18n/ja.po +++ b/addons/web_kanban/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po index 108f28916f2..af149b1f5c4 100644 --- a/addons/web_kanban/i18n/ka.po +++ b/addons/web_kanban/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po index 73f79867686..8f79c56c638 100644 --- a/addons/web_kanban/i18n/mn.po +++ b/addons/web_kanban/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po index 28265f0d03e..845d9fe16f7 100644 --- a/addons/web_kanban/i18n/nl.po +++ b/addons/web_kanban/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po index 35f2e4034f8..1566dca09ac 100644 --- a/addons/web_kanban/i18n/nl_BE.po +++ b/addons/web_kanban/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po index a434f81cb24..ac274f6c782 100644 --- a/addons/web_kanban/i18n/pl.po +++ b/addons/web_kanban/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po index c019f933fea..f3b13127183 100644 --- a/addons/web_kanban/i18n/pt.po +++ b/addons/web_kanban/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po index e0813aacec2..b4dc5224897 100644 --- a/addons/web_kanban/i18n/pt_BR.po +++ b/addons/web_kanban/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po index c6b821cf2b6..a67ab6aa494 100644 --- a/addons/web_kanban/i18n/ro.po +++ b/addons/web_kanban/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po index 452e0508cdd..8ee8a9d60a5 100644 --- a/addons/web_kanban/i18n/ru.po +++ b/addons/web_kanban/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po index 37ab4c6442f..6e9280e9ae2 100644 --- a/addons/web_kanban/i18n/sr@latin.po +++ b/addons/web_kanban/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po index e6111c5f791..a7fbc8227cb 100644 --- a/addons/web_kanban/i18n/sv.po +++ b/addons/web_kanban/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po index 700d391eb5f..b4680d0093c 100644 --- a/addons/web_kanban/i18n/tr.po +++ b/addons/web_kanban/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po index 58687c8204c..afe95bf4374 100644 --- a/addons/web_kanban/i18n/zh_CN.po +++ b/addons/web_kanban/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index d0e754b6224..345becc7cdd 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .openerp .oe_kanban_view { height: inherit; } @@ -10,6 +9,15 @@ visibility: visible !important; height: 60px !important; } +.openerp .oe_kanban_view .ui-sortable-helper { + -moz-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); + -webkit-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); + -box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); + -moz-transform: rotate(3deg); + -webkit-transform: rotate(3deg); + -o-transform: rotate(3deg); + -ms-transform: rotate(3deg); +} .openerp .oe_kanban_view .oe_kanban_left { float: left; } @@ -342,9 +350,10 @@ margin-bottom: 0; } .openerp .oe_kanban_view .oe_kanban_card:hover { - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); - -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); + border: 1px solid #7c7bad; + -moz-box-shadow: 0 0 4px #7c7bad; + -webkit-box-shadow: 0 0 4px #7c7bad; + -box-shadow: 0 0 4px #7c7bad; } .openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span { visibility: visible; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index af71d857d53..b85d3ebea03 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -26,6 +26,12 @@ -moz-box-shadow: $bsval -webkit-box-shadow: $bsval -box-shadow: $bsval + +@mixin transform($transform) + -moz-transform: $transform + -webkit-transform: $transform + -o-transform: $transform + -ms-transform: $transform // }}} .openerp .oe_kanban_view @@ -38,6 +44,9 @@ border: 1px dotted black visibility: visible !important height: 60px !important + .ui-sortable-helper + @include box-shadow(0 1px 20px rgba(0, 0, 0, 0.9)) + @include transform(rotate(3deg)) .oe_kanban_left float: left .oe_kanban_right @@ -304,7 +313,8 @@ &:last-child margin-bottom: 0 &:hover - @include box-shadow(0 0 3px rgba(0,0,0,0.6)) + border: 1px solid #7C7BAD + @include box-shadow(0 0 4px #7C7BAD) .oe_dropdown_kanban > span visibility: visible h3 diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 483ffcfe0a0..ffec52e8b97 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -48,17 +48,17 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, on_loaded: function(data) { this.fields_view = data; - this.$element.addClass(this.fields_view.arch.attrs['class']); + this.$el.addClass(this.fields_view.arch.attrs['class']); this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this})); if (this.options.$buttons) { this.$buttons.appendTo(this.options.$buttons); } else { - this.$element.find('.oe_kanban_buttons').replaceWith(this.$buttons); + this.$el.find('.oe_kanban_buttons').replaceWith(this.$buttons); } this.$buttons .on('click', 'button.oe_kanban_button_new', this.do_add_record) .on('click', '.oe_kanban_add_column', this.do_add_group); - this.$groups = this.$element.find('.oe_kanban_groups tr'); + this.$groups = this.$el.find('.oe_kanban_groups tr'); this.fields_keys = _.keys(this.fields_view.fields); this.add_qweb_template(); this.has_been_loaded.resolve(); @@ -121,7 +121,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ case 'button': case 'a': var type = node.attrs.type || ''; - if (_.indexOf('action,object,edit,delete'.split(','), type) !== -1) { + if (_.indexOf('action,object,edit,open,delete'.split(','), type) !== -1) { _.each(node.attrs, function(v, k) { if (_.indexOf('icon,type,name,args,string,context,states,kanban_states'.split(','), k) != -1) { node.attrs['data-' + k] = v; @@ -188,14 +188,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }; var new_group = new instance.web_kanban.KanbanGroup(self, [], datagroup, dataset); self.do_add_groups([new_group]).then(function() { - $(window).scrollTo(self.groups.slice(-1)[0].$element, { axis: 'x' }); + $(window).scrollTo(self.groups.slice(-1)[0].$el, { axis: 'x' }); }); }); }); }, do_search: function(domain, context, group_by) { var self = this; - this.$element.find('.oe_view_nocontent').remove(); + this.$el.find('.oe_view_nocontent').remove(); this.search_domain = domain; this.search_context = context; this.search_group_by = group_by; @@ -204,14 +204,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ self.group_by_field = self.fields_view.fields[self.group_by] || {}; self.grouped_by_m2o = (self.group_by_field.type === 'many2one'); self.$buttons.find('.oe_alternative').toggle(self.grouped_by_m2o); - self.$element.toggleClass('oe_kanban_grouped_by_m2o', self.grouped_by_m2o); + self.$el.toggleClass('oe_kanban_grouped_by_m2o', self.grouped_by_m2o); self.datagroup = new instance.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []); self.datagroup.list(self.fields_keys, self.do_process_groups, self.do_process_dataset); }); }, do_process_groups: function(groups) { var self = this; - this.$element.remove('oe_kanban_ungrouped').addClass('oe_kanban_grouped'); + this.$el.remove('oe_kanban_ungrouped').addClass('oe_kanban_grouped'); this.add_group_mutex.exec(function() { self.do_clear_groups(); self.dataset.ids = []; @@ -234,7 +234,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, do_process_dataset: function(dataset) { var self = this; - this.$element.remove('oe_kanban_grouped').addClass('oe_kanban_ungrouped'); + this.$el.remove('oe_kanban_grouped').addClass('oe_kanban_ungrouped'); this.add_group_mutex.exec(function() { var def = $.Deferred(); self.do_clear_groups(); @@ -268,7 +268,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }); var groups_started = _.map(this.groups, function(group) { if (!group.is_started) { - return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last')); + return group.insertBefore(self.$el.find('.oe_kanban_groups_headers td:last')); } }); return $.when.apply(null, groups_started).then(function () { @@ -280,12 +280,15 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this.compute_groups_width(); if (this.group_by) { // Kanban cards drag'n'drop - this.$element.find('.oe_kanban_column').sortable({ + this.$el.find('.oe_kanban_column').sortable({ connectWith: '.oe_kanban_column', handle : '.oe_kanban_draghandle', start: function(event, ui) { self.currently_dragging.index = ui.item.index(); self.currently_dragging.group = ui.item.parents('.oe_kanban_column:first').data('widget'); + ui.item.find('*').on('click.prevent', function(ev) { + return false; + }); }, stop: function(event, ui) { var record = ui.item.data('widget'); @@ -296,6 +299,11 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ if (!(old_group.title === new_group.title && old_group.value === new_group.value && old_index == new_index)) { self.on_record_moved(record, old_group, old_index, new_group, new_index); } + setTimeout(function() { + // A bit hacky but could not find a better solution for Firefox (problem not present in chrome) + // http://stackoverflow.com/questions/274843/preventing-javascript-click-event-with-scriptaculous-drag-and-drop + ui.item.find('*').off('click.prevent'); + }, 0); }, scroll: false }); @@ -333,13 +341,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }); } } else { - this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); + this.$el.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); } }, on_record_moved : function(record, old_group, old_index, new_group, new_index) { var self = this; $.fn.tipsy.clear(); - $(old_group.$element).add(new_group.$element).find('.oe_kanban_aggregates, .oe_kanban_group_length').hide(); + $(old_group.$el).add(new_group.$el).find('.oe_kanban_aggregates, .oe_kanban_group_length').hide(); if (old_group === new_group) { new_group.records.splice(old_index, 1); new_group.records.splice(new_index, 0, record); @@ -365,18 +373,18 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ var self = this; _.each(this.groups, function(group) { unfolded += group.state.folded ? 0 : 1; - group.$element.children(':first').css('width', ''); + group.$el.children(':first').css('width', ''); }); _.each(this.groups, function(group) { if (!group.state.folded) { - if (182*unfolded>=self.$element.width()) { - group.$element.children(':first').css('width', "170px"); - } else if (262*unfolded<self.$element.width()) { - group.$element.children(':first').css('width', "250px"); + if (182*unfolded>=self.$el.width()) { + group.$el.children(':first').css('width', "170px"); + } else if (262*unfolded<self.$el.width()) { + group.$el.children(':first').css('width', "250px"); } else { // -12 because of padding 6 between cards // -1 because of the border of the latest dummy column - group.$element.children(':first').css('width', Math.floor((self.$element.width()-1)/unfolded)-12 + 'px'); + group.$el.children(':first').css('width', Math.floor((self.$el.width()-1)/unfolded)-12 + 'px'); } } }); @@ -408,8 +416,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ || !this.options.action.help) { return; } - this.$element.find('.oe_view_nocontent').remove(); - this.$element.prepend( + this.$el.find('.oe_view_nocontent').remove(); + this.$el.prepend( $('<div class="oe_view_nocontent">').html(this.options.action.help) ); } @@ -471,22 +479,22 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ var self = this, def = this._super(); if (! self.view.group_by) { - self.$element.addClass("oe_kanban_no_group"); + self.$el.addClass("oe_kanban_no_group"); self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false) .on('added', self, self.proxy('quick_created')); self.quick.replace($(".oe_kanban_no_group_qc_placeholder")); } this.$records = $(QWeb.render('KanbanView.group_records_container', { widget : this})); - this.$records.insertBefore(this.view.$element.find('.oe_kanban_groups_records td:last')); + this.$records.insertBefore(this.view.$el.find('.oe_kanban_groups_records td:last')); - this.$element.on('click', '.oe_kanban_group_dropdown li a', function(ev) { + this.$el.on('click', '.oe_kanban_group_dropdown li a', function(ev) { var fn = 'do_action_' + $(ev.target).data().action; if (typeof(self[fn]) === 'function') { self[fn]($(ev.target)); } }); - this.$element.find('.oe_kanban_add').click(function () { + this.$el.find('.oe_kanban_add').click(function () { if (self.quick) { return; } var ctx = {}; ctx['default_' + self.view.group_by] = self.value; @@ -500,12 +508,12 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ self.quick.focus(); }); // Add bounce effect on image '+' of kanban header when click on empty space of kanban grouped column. - var add_btn = this.$element.find('.oe_kanban_add'); + var add_btn = this.$el.find('.oe_kanban_add'); this.$records.find('.oe_kanban_show_more').click(this.do_show_more); if (this.state.folded) { this.do_toggle_fold(); } - this.$element.data('widget', this); + this.$el.data('widget', this); this.$records.data('widget', this); this.$has_been_started.resolve(); this.compute_cards_auto_height(); @@ -525,7 +533,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ var min_height = 0; var els = []; _.each(this.records, function(r) { - var $e = r.$element.children(':first:not(.oe_kanban_no_auto_height)').css('min-height', 0); + var $e = r.$el.children(':first:not(.oe_kanban_no_auto_height)').css('min-height', 0); if ($e.length) { els.push($e[0]); min_height = Math.max(min_height, $e.outerHeight()); @@ -571,8 +579,8 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ } }, do_toggle_fold: function(compute_width) { - this.$element.add(this.$records).toggleClass('oe_kanban_group_folded'); - this.state.folded = this.$element.is('.oe_kanban_group_folded'); + this.$el.add(this.$records).toggleClass('oe_kanban_group_folded'); + this.state.folded = this.$el.is('.oe_kanban_group_folded'); this.$("ul.oe_kanban_group_dropdown li a[data-action=toggle_fold]").text((this.state.folded) ? _t("Unfold") : _t("Fold")); }, do_action_toggle_fold: function() { @@ -658,7 +666,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ }, start: function() { this._super(); - this.$element.data('widget', this); + this.$el.data('widget', this); this.bind_events(); }, transform_record: function(record) { @@ -696,14 +704,14 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ bind_events: function() { var self = this; this.setup_color_picker(); - var $show_on_click = self.$element.find('.oe_kanban_box_show_onclick'); + var $show_on_click = self.$el.find('.oe_kanban_box_show_onclick'); $show_on_click.toggle(this.state.folded); - this.$element.find('.oe_kanban_box_show_onclick_trigger').click(function() { + this.$el.find('.oe_kanban_box_show_onclick_trigger').click(function() { $show_on_click.toggle(); self.state.folded = !self.state.folded; }); - this.$element.find('[tooltip]').tipsy({ + this.$el.find('[tooltip]').tipsy({ delayIn: 500, delayOut: 0, fade: true, @@ -721,11 +729,11 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ }); // If no draghandle is found, make the whole card as draghandle - if (!this.$element.find('.oe_kanban_draghandle').length) { - this.$element.children(':first').addClass('oe_kanban_draghandle'); + if (!this.$el.find('.oe_kanban_draghandle').length) { + this.$el.children(':first').addClass('oe_kanban_draghandle'); } - this.$element.find('.oe_kanban_action').click(function() { + this.$el.find('.oe_kanban_action').click(function() { var $action = $(this), type = $action.data('type') || 'button', method = 'do_action_' + (type === 'action' ? 'object' : type); @@ -738,8 +746,8 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ } }); - if (this.$element.find('.oe_kanban_global_click').length) { - this.$element.on('click', function(ev) { + if (this.$el.find('.oe_kanban_global_click').length) { + this.$el.on('click', function(ev) { if (!ev.isTrigger && !$(ev.target).data('events')) { var trigger = true; var elem = ev.target; @@ -784,7 +792,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ }, setup_color_picker: function() { var self = this; - var $el = this.$element.find('ul.oe_kanban_colorpicker'); + var $el = this.$el.find('ul.oe_kanban_colorpicker'); if ($el.length) { $el.html(QWeb.render('KanbanColorPicker', { widget: this @@ -819,6 +827,9 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ do_action_edit: function($action) { this.view.open_record(this.id, true); }, + do_action_open: function($action) { + this.view.open_record(this.id); + }, do_action_object: function ($action) { var button_attrs = $action.data(); this.view.do_execute_action(button_attrs, this.view.dataset, this.id, this.do_reload); @@ -829,7 +840,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ if (records.length) { self.set_record(records[0]); self.renderElement(); - self.$element.data('widget', self); + self.$el.data('widget', self); self.bind_events(); self.group.compute_cards_auto_height(); } else { @@ -865,7 +876,8 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ var email_md5 = $.md5(email); return 'http://www.gravatar.com/avatar/' + email_md5 + '.png?s=' + size + '&d=' + default_; }, - kanban_image: function(model, field, id, cache) { + kanban_image: function(model, field, id, cache, options) { + options = options || {}; var url; if (this.record[field] && this.record[field].value && ! /^\d+(\.\d*)? \w+$/.test(this.record[field].value)) { url = 'data:image/png;base64,' + this.record[field].value; @@ -873,6 +885,8 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ url = "/web/static/src/img/placeholder.png"; } else { id = escape(JSON.stringify(id)); + if (options.preview_image) + field = options.preview_image; url = instance.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; if (cache !== undefined) { // Set the cache duration in seconds. @@ -920,16 +934,16 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ }, start: function () { var self = this; - self.$input = this.$element.find('input'); + self.$input = this.$el.find('input'); self.$input.keyup(function(event){ if(event.keyCode == 13){ self.quick_add(); } }); - $(".oe_kanban_quick_create_add", this.$element).click(function () { + $(".oe_kanban_quick_create_add", this.$el).click(function () { self.quick_add(); }); - $(".oe_kanban_quick_create_close", this.$element).click(function () { + $(".oe_kanban_quick_create_close", this.$el).click(function () { self.trigger('close'); }); self.$input.keyup(function(e) { @@ -939,7 +953,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ }); }, focus: function() { - this.$element.find('input').focus(); + this.$el.find('input').focus(); }, /** * Handles user event from nested quick creation view diff --git a/addons/web_mobile/__openerp__.py b/addons/web_mobile/__openerp__.py index 614315a8a83..b37db9eeb54 100644 --- a/addons/web_mobile/__openerp__.py +++ b/addons/web_mobile/__openerp__.py @@ -1,8 +1,12 @@ { - "name" : "OpenERP Web Mobile", - "category": "Hidden", - "description":"""OpenERP Web Mobile.""", - "version" : "2.0", - "depends" : [], + 'name': 'OpenERP Web Mobile', + 'category': 'Hidden', + 'description': """ +OpenERP Web Mobile. +=================== + +""", + 'version': '2.0', + 'depends': [], 'auto_install': True, } diff --git a/addons/web_mobile/i18n/ar.po b/addons/web_mobile/i18n/ar.po index a857e918207..3de8759b2dc 100644 --- a/addons/web_mobile/i18n/ar.po +++ b/addons/web_mobile/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/bg.po b/addons/web_mobile/i18n/bg.po index 67b7687f1d3..ee00adfcd7d 100644 --- a/addons/web_mobile/i18n/bg.po +++ b/addons/web_mobile/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/bn.po b/addons/web_mobile/i18n/bn.po index e62f6ad478c..1b44460ca2a 100644 --- a/addons/web_mobile/i18n/bn.po +++ b/addons/web_mobile/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/ca.po b/addons/web_mobile/i18n/ca.po index e3712f047e0..549fbe4c293 100644 --- a/addons/web_mobile/i18n/ca.po +++ b/addons/web_mobile/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/cs.po b/addons/web_mobile/i18n/cs.po index df10f87bd59..e763d39f5f0 100644 --- a/addons/web_mobile/i18n/cs.po +++ b/addons/web_mobile/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_mobile/i18n/da.po b/addons/web_mobile/i18n/da.po index 54be9563eba..de50fabcc92 100644 --- a/addons/web_mobile/i18n/da.po +++ b/addons/web_mobile/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/de.po b/addons/web_mobile/i18n/de.po index 2a08d22774b..333ff3dbe8b 100644 --- a/addons/web_mobile/i18n/de.po +++ b/addons/web_mobile/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/en_GB.po b/addons/web_mobile/i18n/en_GB.po index 6ddba3107bb..3e5f28c0926 100644 --- a/addons/web_mobile/i18n/en_GB.po +++ b/addons/web_mobile/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/es.po b/addons/web_mobile/i18n/es.po index 40efc29ca12..f759255d2e2 100644 --- a/addons/web_mobile/i18n/es.po +++ b/addons/web_mobile/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/es_CL.po b/addons/web_mobile/i18n/es_CL.po index 10d211c6703..3740454da3e 100644 --- a/addons/web_mobile/i18n/es_CL.po +++ b/addons/web_mobile/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/es_CR.po b/addons/web_mobile/i18n/es_CR.po index 049c79a86f9..37d3cce2ece 100644 --- a/addons/web_mobile/i18n/es_CR.po +++ b/addons/web_mobile/i18n/es_CR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: es\n" #. openerp-web diff --git a/addons/web_mobile/i18n/es_EC.po b/addons/web_mobile/i18n/es_EC.po index 54ea73f77e9..024f43fe95e 100644 --- a/addons/web_mobile/i18n/es_EC.po +++ b/addons/web_mobile/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/et.po b/addons/web_mobile/i18n/et.po index 3e7fd7b5207..53a33579baa 100644 --- a/addons/web_mobile/i18n/et.po +++ b/addons/web_mobile/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/fi.po b/addons/web_mobile/i18n/fi.po index 0b3e4e90ee2..3dab2df2813 100644 --- a/addons/web_mobile/i18n/fi.po +++ b/addons/web_mobile/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/fr.po b/addons/web_mobile/i18n/fr.po index 0fbf5b5c47b..5cf9858ae48 100644 --- a/addons/web_mobile/i18n/fr.po +++ b/addons/web_mobile/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/gl.po b/addons/web_mobile/i18n/gl.po index fe650ea3037..76f288d644e 100644 --- a/addons/web_mobile/i18n/gl.po +++ b/addons/web_mobile/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/hr.po b/addons/web_mobile/i18n/hr.po index 75e493d8d70..d1bd2cbd2fe 100644 --- a/addons/web_mobile/i18n/hr.po +++ b/addons/web_mobile/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/it.po b/addons/web_mobile/i18n/it.po index 6de95bd96db..893f83f15ad 100644 --- a/addons/web_mobile/i18n/it.po +++ b/addons/web_mobile/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po index 8fff1fc88ee..1dd00df3e12 100644 --- a/addons/web_mobile/i18n/ja.po +++ b/addons/web_mobile/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/ka.po b/addons/web_mobile/i18n/ka.po index d1e24436311..ea0e4dd832c 100644 --- a/addons/web_mobile/i18n/ka.po +++ b/addons/web_mobile/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/mk.po b/addons/web_mobile/i18n/mk.po index 36612708308..8fdb193c5ee 100644 --- a/addons/web_mobile/i18n/mk.po +++ b/addons/web_mobile/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/mn.po b/addons/web_mobile/i18n/mn.po index 84056a3d0f1..23ab90661b9 100644 --- a/addons/web_mobile/i18n/mn.po +++ b/addons/web_mobile/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/nb.po b/addons/web_mobile/i18n/nb.po index ffe5b4aeb86..d9a95d25005 100644 --- a/addons/web_mobile/i18n/nb.po +++ b/addons/web_mobile/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/nl.po b/addons/web_mobile/i18n/nl.po index dcfcf46fca1..4120c477353 100644 --- a/addons/web_mobile/i18n/nl.po +++ b/addons/web_mobile/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/nl_BE.po b/addons/web_mobile/i18n/nl_BE.po index 0b891d18814..8b186d8b501 100644 --- a/addons/web_mobile/i18n/nl_BE.po +++ b/addons/web_mobile/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/pl.po b/addons/web_mobile/i18n/pl.po index eae6e1fa58c..37508eb5023 100644 --- a/addons/web_mobile/i18n/pl.po +++ b/addons/web_mobile/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/pt.po b/addons/web_mobile/i18n/pt.po index 45a08eca402..ce9ce0561d5 100644 --- a/addons/web_mobile/i18n/pt.po +++ b/addons/web_mobile/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/pt_BR.po b/addons/web_mobile/i18n/pt_BR.po index c3c512368c1..0f36885dcdd 100644 --- a/addons/web_mobile/i18n/pt_BR.po +++ b/addons/web_mobile/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/ro.po b/addons/web_mobile/i18n/ro.po index 74140841f95..d8d3fbe49c3 100644 --- a/addons/web_mobile/i18n/ro.po +++ b/addons/web_mobile/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/ru.po b/addons/web_mobile/i18n/ru.po index 8e4bb59d106..f2a9944526e 100644 --- a/addons/web_mobile/i18n/ru.po +++ b/addons/web_mobile/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/sk.po b/addons/web_mobile/i18n/sk.po index 3c6b656e712..e4e20e359af 100644 --- a/addons/web_mobile/i18n/sk.po +++ b/addons/web_mobile/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/sl.po b/addons/web_mobile/i18n/sl.po index b9e108c0a83..61faff58ff4 100644 --- a/addons/web_mobile/i18n/sl.po +++ b/addons/web_mobile/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/sq.po b/addons/web_mobile/i18n/sq.po index aa2143d63a0..4b42897beb0 100644 --- a/addons/web_mobile/i18n/sq.po +++ b/addons/web_mobile/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/sr@latin.po b/addons/web_mobile/i18n/sr@latin.po index 8a5c27d1ad9..b89a6aa1a67 100644 --- a/addons/web_mobile/i18n/sr@latin.po +++ b/addons/web_mobile/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/sv.po b/addons/web_mobile/i18n/sv.po index 5881e60c1b5..96346415130 100644 --- a/addons/web_mobile/i18n/sv.po +++ b/addons/web_mobile/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/tr.po b/addons/web_mobile/i18n/tr.po index 50b281b9bf7..e7686c9ce6c 100644 --- a/addons/web_mobile/i18n/tr.po +++ b/addons/web_mobile/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/uk.po b/addons/web_mobile/i18n/uk.po index 217e1b760d4..adb524f0f5c 100644 --- a/addons/web_mobile/i18n/uk.po +++ b/addons/web_mobile/i18n/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/i18n/zh_CN.po b/addons/web_mobile/i18n/zh_CN.po index 3c685a14de7..74858dec30d 100644 --- a/addons/web_mobile/i18n/zh_CN.po +++ b/addons/web_mobile/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index fce7aed6d48..1fe731d0b4c 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -51,7 +51,7 @@ instance.web_mobile.MobileWebClient = instance.web_mobile.MobileWidget.extend({ var self = this; this.session.bind_session().then(function() { instance.web.qweb.add_template("xml/web_mobile.xml"); - self.$element.html(self.render()); + self.$el.html(self.render()); self.login.start(); }); } @@ -76,18 +76,18 @@ instance.web_mobile.Login = instance.web_mobile.MobileWidget.extend({ self.db_list = result.db_list; this.setElement($('#'+self.element_id).html(self.render(self))); if(self.session.db!=""){ - self.$element.find("#database").val(self.session.db); + self.$el.find("#database").val(self.session.db); } - self.$element.find("#login_btn").click(self.on_login); + self.$el.find("#login_btn").click(self.on_login); $.mobile.initializePage(); }); - this.$element + this.$el .removeClass("login_invalid"); }, on_login: function(ev) { ev.preventDefault(); var self = this; - var $e = this.$element; + var $e = this.$el; var db = $e.find("div select[name=database]").val(); var login = $e.find("div input[name=login]").val(); var password = $e.find("div input[name=password]").val(); @@ -117,13 +117,13 @@ instance.web_mobile.Login = instance.web_mobile.MobileWidget.extend({ }); }, on_login_invalid: function() { - this.$element + this.$el .removeClass("login_valid") .addClass("login_invalid") .show(); }, on_login_valid: function() { - this.$element + this.$el .removeClass("login_invalid") .addClass("login_valid"); //.hide(); @@ -152,7 +152,7 @@ instance.web_mobile.Header = instance.web_mobile.MobileWidget.extend({ this._super(session, element_id); }, start: function() { - this.$element.html(this.render(this)); + this.$el.html(this.render(this)); } }); @@ -164,7 +164,7 @@ instance.web_mobile.Footer = instance.web_mobile.MobileWidget.extend({ this._super(session, element_id); }, start: function() { - this.$element.html(this.render(this)); + this.$el.html(this.render(this)); } }); @@ -178,12 +178,12 @@ instance.web_mobile.Shortcuts = instance.web_mobile.MobileWidget.extend({ start: function() { var self = this; this.rpc('/web/session/sc_list',{} ,function(res){ - self.$element.html(self.render({'sc': res})); - self.$element.find("[data-role=header]").find('h1').html('Favourite'); - self.$element.find("[data-role=header]").find('#home').click(function(){ + self.$el.html(self.render({'sc': res})); + self.$el.find("[data-role=header]").find('h1').html('Favourite'); + self.$el.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); }); - self.$element.find('#content').find("a").click(self.on_clicked); + self.$el.find('#content').find("a").click(self.on_clicked); $.mobile.changePage("#oe_shortcuts", "slide", false, true); }); }, @@ -228,10 +228,10 @@ instance.web_mobile.Menu = instance.web_mobile.MobileWidget.extend({ this.header.start(); this.footer = new instance.web_mobile.Footer(this, "oe_footer"); this.footer.start(); - this.$element.html(this.render(this.data)); - this.$element.find("[data-role=header]").find('h1').html('Applications'); - this.$element.find("[data-role=header]").find('#home').hide(); - this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){ + this.$el.html(this.render(this.data)); + this.$el.find("[data-role=header]").find('h1').html('Applications'); + this.$el.find("[data-role=header]").find('#home').hide(); + this.$el.find("[data-role=footer]").find('#shrotcuts').click(function(){ if(!$('#oe_shortcuts').html().length){ this.shortcuts = new instance.web_mobile.Shortcuts(self, "oe_shortcuts"); this.shortcuts.start(); @@ -239,7 +239,7 @@ instance.web_mobile.Menu = instance.web_mobile.MobileWidget.extend({ $.mobile.changePage($("#oe_shortcuts"), "slide", false, true); } }); - this.$element.find("[data-role=footer]").find('#preference').click(function(){ + this.$el.find("[data-role=footer]").find('#preference').click(function(){ if(!$('#oe_options').html().length){ this.options = new instance.web_mobile.Options(self, "oe_options"); this.options.start(); @@ -247,7 +247,7 @@ instance.web_mobile.Menu = instance.web_mobile.MobileWidget.extend({ $.mobile.changePage("#oe_options", "slide", false, true); } }); - this.$element.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click); + this.$el.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click); $.mobile.changePage("#oe_menu", "slide", false, true); }, on_menu_click: function(ev, id) { @@ -260,7 +260,7 @@ instance.web_mobile.Menu = instance.web_mobile.MobileWidget.extend({ this.children = this.data.data.children[i]; } } - this.$element + this.$el .removeClass("login_valid") .addClass("secondary_menu"); if(!$('[id^="oe_sec_menu_'+id+'"]').html()){ @@ -284,10 +284,10 @@ instance.web_mobile.Secondary = instance.web_mobile.MobileWidget.extend({ start: function(ev, id) { var self = this; var v = { menu : this.data }; - this.$element.html(this.render(v)); - this.$element.find("[data-role=header]").find("h1").html(this.data.name); - this.$element.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click); - this.$element.find("[data-role=header]").find('#home').click(function(){ + this.$el.html(this.render(v)); + this.$el.find("[data-role=header]").find("h1").html(this.data.name); + this.$el.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click); + this.$el.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); }); $.mobile.changePage("#"+this.element_id, "slide", false, true); @@ -308,7 +308,7 @@ instance.web_mobile.Secondary = instance.web_mobile.MobileWidget.extend({ } } if (child_len > 0) { - this.$element + this.$el .addClass("secondary_menu"); if(!$('[id^="oe_sec_menu_'+id+'"]').html()){ $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe'); @@ -336,12 +336,12 @@ instance.web_mobile.Options = instance.web_mobile.MobileWidget.extend({ start: function() { var self = this; - this.$element.html(this.render(this)); - this.$element.find("[data-role=header]").find('h1').html('Preference'); - this.$element.find("[data-role=header]").find('#home').click(function(){ + this.$el.html(this.render(this)); + this.$el.find("[data-role=header]").find('h1').html('Preference'); + this.$el.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); }); - this.$element.find("[data-role=content]").find('a').click(function(){ + this.$el.find("[data-role=content]").find('a').click(function(){ $('#oe_login').empty(); window.location.replace('/mobile'); }); diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 6b3cd09175e..a5e02f418bb 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -48,12 +48,12 @@ instance.web_mobile.FormView = instance.web_mobile.MobileWidget.extend({ } } self.hidden_fields(get_fields,fields); - self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : values ,'temp_flag':'1'})); - self.$element.find("[data-role=header]").find('h1').html(self.head_title); - self.$element.find("[data-role=header]").find('#home').click(function(){ + self.$el.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : values ,'temp_flag':'1'})); + self.$el.find("[data-role=header]").find('h1').html(self.head_title); + self.$el.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); }); - self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){ + self.$el.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){ for (var k = 0; k < notebooks.children.length; k++) { if (notebooks.children[k].attrs.string == $(this).attr('id')) { get_fields_notebook = self.get_fields(notebooks.children[k].children); @@ -62,7 +62,7 @@ instance.web_mobile.FormView = instance.web_mobile.MobileWidget.extend({ } } }); - self.$element.find('#o2m_m2m').click(function(ev) { + self.$el.find('#o2m_m2m').click(function(ev) { ev.preventDefault(); ev.stopPropagation(); var relational = $(this).attr('for'); @@ -113,7 +113,7 @@ instance.web_mobile.FormView = instance.web_mobile.MobileWidget.extend({ }); } }); - self.$element.find('#m2o_btn').click(this.open_m2o_form); + self.$el.find('#m2o_btn').click(this.open_m2o_form); $.mobile.changePage("#"+self.element_id, "slide", false, true); self.formatdata('', '', '', '',self.element_id,'slider'); }, diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js index b48753c82f2..7c39efb17f0 100644 --- a/addons/web_mobile/static/src/js/list_mobile.js +++ b/addons/web_mobile/static/src/js/list_mobile.js @@ -44,14 +44,14 @@ instance.web_mobile.ListView = instance.web_mobile.MobileWidget.extend({ if(res['html_name_get']){ additional = res['display']; } - self.$element.html(self.render({'records': res, 'data': additional })); - self.$element.find("[data-role=header]").find('h1').html(self.action.name); - self.$element.find("[data-role=header]").find('#home').click(function(){ + self.$el.html(self.render({'records': res, 'data': additional })); + self.$el.find("[data-role=header]").find('h1').html(self.action.name); + self.$el.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); }); - self.$element.find("a#list-id").click(self.on_list_click); + self.$el.find("a#list-id").click(self.on_list_click); $.mobile.changePage("#"+self.element_id, "slide", false, true); - self.$element.find("a#list-id").find('span').addClass('desc'); + self.$el.find("a#list-id").find('span').addClass('desc'); }); }); }, diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py index 9aea38a0676..7192e83fda7 100644 --- a/addons/web_process/__openerp__.py +++ b/addons/web_process/__openerp__.py @@ -1,17 +1,21 @@ { - "name" : "Process", - "version": "2.0", - "description":"""OpenERP Web process view.""", - "depends" : ["web_diagram"], - "js": [ + 'name': 'Process', + 'version': '2.0', + 'description': """ +OpenERP Web process view. +========================= + +""", + 'depends': ['web_diagram'], + 'js': [ 'static/lib/dracula/*.js', - "static/src/js/process.js" + 'static/src/js/process.js' ], - "css": [ - "static/src/css/process.css" + 'css': [ + 'static/src/css/process.css' ], 'qweb': [ - "static/src/xml/*.xml" + 'static/src/xml/*.xml' ], 'auto_install': True } diff --git a/addons/web_process/i18n/ar.po b/addons/web_process/i18n/ar.po index ea859471591..72a5c159837 100644 --- a/addons/web_process/i18n/ar.po +++ b/addons/web_process/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po index 6e50347604d..06e665e6461 100644 --- a/addons/web_process/i18n/bg.po +++ b/addons/web_process/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/bn.po b/addons/web_process/i18n/bn.po index f4b9200cea5..794f455c01b 100644 --- a/addons/web_process/i18n/bn.po +++ b/addons/web_process/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/bs.po b/addons/web_process/i18n/bs.po index 624147c778e..ad3ce96d2e5 100644 --- a/addons/web_process/i18n/bs.po +++ b/addons/web_process/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/ca.po b/addons/web_process/i18n/ca.po index 042dd92ddc0..6651543f116 100644 --- a/addons/web_process/i18n/ca.po +++ b/addons/web_process/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/cs.po b/addons/web_process/i18n/cs.po index 75d864080af..92fce23f2e2 100644 --- a/addons/web_process/i18n/cs.po +++ b/addons/web_process/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web_process/i18n/da.po b/addons/web_process/i18n/da.po index c32a0fe34ac..c281de396d7 100644 --- a/addons/web_process/i18n/da.po +++ b/addons/web_process/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/de.po b/addons/web_process/i18n/de.po index 4f3bedc25fd..ef5675f43d2 100644 --- a/addons/web_process/i18n/de.po +++ b/addons/web_process/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/en_GB.po b/addons/web_process/i18n/en_GB.po index 6d5489a69fa..02fd1a2a89f 100644 --- a/addons/web_process/i18n/en_GB.po +++ b/addons/web_process/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/es.po b/addons/web_process/i18n/es.po index 20eadc5e9c0..f7450da2c86 100644 --- a/addons/web_process/i18n/es.po +++ b/addons/web_process/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/es_CL.po b/addons/web_process/i18n/es_CL.po index 9b03561891d..da498591b30 100644 --- a/addons/web_process/i18n/es_CL.po +++ b/addons/web_process/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/es_CR.po b/addons/web_process/i18n/es_CR.po index c1af7b95e6a..fe65649beae 100644 --- a/addons/web_process/i18n/es_CR.po +++ b/addons/web_process/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/es_EC.po b/addons/web_process/i18n/es_EC.po index a262d1960f3..4a3f033a8fb 100644 --- a/addons/web_process/i18n/es_EC.po +++ b/addons/web_process/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/fi.po b/addons/web_process/i18n/fi.po index 0df097bcc28..75873df0fd0 100644 --- a/addons/web_process/i18n/fi.po +++ b/addons/web_process/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/fr.po b/addons/web_process/i18n/fr.po index 6d69ee86239..79fd6884b65 100644 --- a/addons/web_process/i18n/fr.po +++ b/addons/web_process/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/gl.po b/addons/web_process/i18n/gl.po index fd7fb52ff34..f2b93ca8761 100644 --- a/addons/web_process/i18n/gl.po +++ b/addons/web_process/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/hr.po b/addons/web_process/i18n/hr.po index 76e99c4f4b5..d1a42cbda04 100644 --- a/addons/web_process/i18n/hr.po +++ b/addons/web_process/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po index 8069194bb7b..611bfd998fb 100644 --- a/addons/web_process/i18n/hu.po +++ b/addons/web_process/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/it.po b/addons/web_process/i18n/it.po index efa8901bdc7..78bbfbaa1f8 100644 --- a/addons/web_process/i18n/it.po +++ b/addons/web_process/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po index 68774c3f627..a67043d1113 100644 --- a/addons/web_process/i18n/ja.po +++ b/addons/web_process/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/ka.po b/addons/web_process/i18n/ka.po index 6331faf22d3..3be606943a2 100644 --- a/addons/web_process/i18n/ka.po +++ b/addons/web_process/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/mk.po b/addons/web_process/i18n/mk.po index 720263ba06e..85167ec26e5 100644 --- a/addons/web_process/i18n/mk.po +++ b/addons/web_process/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/mn.po b/addons/web_process/i18n/mn.po index d3233b96554..54394dacb7a 100644 --- a/addons/web_process/i18n/mn.po +++ b/addons/web_process/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/nb.po b/addons/web_process/i18n/nb.po index e61645ce913..5aa2a4603d6 100644 --- a/addons/web_process/i18n/nb.po +++ b/addons/web_process/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/nl.po b/addons/web_process/i18n/nl.po index 0d8f3fdc714..ad4cb1fbff3 100644 --- a/addons/web_process/i18n/nl.po +++ b/addons/web_process/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/nl_BE.po b/addons/web_process/i18n/nl_BE.po index 80c59dfc39c..7a7359a3cfe 100644 --- a/addons/web_process/i18n/nl_BE.po +++ b/addons/web_process/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/pl.po b/addons/web_process/i18n/pl.po index b8567fedcc2..441eb9115b0 100644 --- a/addons/web_process/i18n/pl.po +++ b/addons/web_process/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/pt.po b/addons/web_process/i18n/pt.po index 7ae7a0eea10..e9ec4c7b663 100644 --- a/addons/web_process/i18n/pt.po +++ b/addons/web_process/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/pt_BR.po b/addons/web_process/i18n/pt_BR.po index 3f0ea4041a6..68716f1fd13 100644 --- a/addons/web_process/i18n/pt_BR.po +++ b/addons/web_process/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/ro.po b/addons/web_process/i18n/ro.po index 6d6171e51b7..cded77fcbc6 100644 --- a/addons/web_process/i18n/ro.po +++ b/addons/web_process/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/ru.po b/addons/web_process/i18n/ru.po index 37e6440d033..873b2a6e223 100644 --- a/addons/web_process/i18n/ru.po +++ b/addons/web_process/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/sl.po b/addons/web_process/i18n/sl.po index d92a19e3ad6..853faab9eb0 100644 --- a/addons/web_process/i18n/sl.po +++ b/addons/web_process/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/sr@latin.po b/addons/web_process/i18n/sr@latin.po index dc24968c321..44c4503f5cd 100644 --- a/addons/web_process/i18n/sr@latin.po +++ b/addons/web_process/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/sv.po b/addons/web_process/i18n/sv.po index 1c9d28e265a..cfb50ae035d 100644 --- a/addons/web_process/i18n/sv.po +++ b/addons/web_process/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/tr.po b/addons/web_process/i18n/tr.po index f5cb39838b6..29cccb89ce0 100644 --- a/addons/web_process/i18n/tr.po +++ b/addons/web_process/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/i18n/zh_CN.po b/addons/web_process/i18n/zh_CN.po index a57eeb2d3b5..4af2e3fe9fd 100644 --- a/addons/web_process/i18n/zh_CN.po +++ b/addons/web_process/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:51+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 60259f26b64..c2192a9a10a 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -15,7 +15,7 @@ openerp.web_process = function (instance) { var self = this, grandparent = this.getParent() && this.getParent().getParent(), view = this.views[this.views_src[0].view_type], - $process_view = this.$element.find('.oe_process'); + $process_view = this.$el.find('.oe_process'); if (!(grandparent instanceof instance.web.WebClient) || !(view.view_type === this.views_src[0].view_type && view.view_id === this.views_src[0].view_id)) { @@ -124,12 +124,12 @@ openerp.web_process = function (instance) { return def.promise(); }, render_process_view : function() { - this.$element.html(QWeb.render("ProcessView", this)); + this.$el.html(QWeb.render("ProcessView", this)); var self = this; - this.$element.find('#edit_process').click(function() { + this.$el.find('#edit_process').click(function() { self.edit_process_view(); }); - var $parent = this.getParent().$element; + var $parent = this.getParent().$el; $parent.find('#change_process').click(function() { self.process_selection = false, self.process_id = $parent.find('#select_process').val(), @@ -137,7 +137,7 @@ openerp.web_process = function (instance) { self.initialize_process_view(); }); - this.$element.find(".process_subflow").click(function() { + this.$el.find(".process_subflow").click(function() { self.process_id = this.id; self.initialize_process_view(); }); @@ -248,7 +248,7 @@ openerp.web_process = function (instance) { context: dataset.context }, function(result) { var action_manager = new instance.web.ActionManager(self); - action_manager.replace(self.$element); + action_manager.replace(self.$el); action_manager.do_action(result.result); }); }); @@ -271,7 +271,7 @@ openerp.web_process = function (instance) { ] }).open(); - action_manager.appendTo(dialog.$element); + action_manager.appendTo(dialog.$el); action_manager.do_action({ res_model : 'process.process', res_id: self.process_id, diff --git a/addons/web_rpc/i18n/es_CR.po b/addons/web_rpc/i18n/es_CR.po new file mode 100644 index 00000000000..5f4d870c7fe --- /dev/null +++ b/addons/web_rpc/i18n/es_CR.po @@ -0,0 +1,20 @@ +# Spanish (Costa Rica) translation for openerp-web +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-07-02 09:06+0200\n" +"PO-Revision-Date: 2012-02-16 19:19+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Costa Rica) <es_CR@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: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" + + diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py index b76028b9418..b34f96f78b2 100644 --- a/addons/web_tests/__openerp__.py +++ b/addons/web_tests/__openerp__.py @@ -1,10 +1,14 @@ { - "name": "Tests", - "category": "Hidden", - "description":"""OpenERP Web test suite.""", - "version": "2.0", - "depends": [], - "js": ["static/src/js/*.js"], - "css": ['static/src/css/*.css'], + 'name': 'Tests', + 'category': 'Hidden', + 'description': """ +OpenERP Web test suite. +======================= + +""", + 'version': '2.0', + 'depends': [], + 'js': ['static/src/js/*.js'], + 'css': ['static/src/css/*.css'], 'auto_install': True, } diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po index c3dad325ed1..5f4d870c7fe 100644 --- a/addons/web_tests/i18n/es_CR.po +++ b/addons/web_tests/i18n/es_CR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js index ffc32a93aaf..5b9c1d02503 100644 --- a/addons/web_tests/static/src/js/web_tests.js +++ b/addons/web_tests/static/src/js/web_tests.js @@ -18,7 +18,7 @@ openerp.web_tests = function (instance) { start: function () { $.when( this.dataset.read_slice(), - this.form.appendTo(this.$element)).then(this.on_everything_loaded); + this.form.appendTo(this.$el)).then(this.on_everything_loaded); }, on_everything_loaded: function (slice) { var records = slice[0].records; @@ -29,7 +29,7 @@ openerp.web_tests = function (instance) { this.form.on_record_loaded(records[0]); _(records.slice(1)).each(function (record, index) { this.dataset.index = index+1; - this.form.reposition($('<div>').appendTo(this.$element)); + this.form.reposition($('<div>').appendTo(this.$el)); this.form.on_record_loaded(record); }, this); } diff --git a/addons/web_view_editor/__openerp__.py b/addons/web_view_editor/__openerp__.py index 317a6cbc367..2ead0bb21fd 100644 --- a/addons/web_view_editor/__openerp__.py +++ b/addons/web_view_editor/__openerp__.py @@ -1,14 +1,15 @@ { - "name": "View Editor", - "category": "Hidden", - "description": - """ - OpenERP Web to edit views. + 'name': 'View Editor', + 'category': 'Hidden', + 'description': """ +OpenERP Web to edit views. +========================== + """, - "version": "2.0", - "depends":['web'], - "js": ["static/src/js/view_editor.js"], - "css": ['static/src/css/view_editor.css'], - "qweb": ['static/src/xml/view_editor.xml'], + 'version': '2.0', + 'depends':['web'], + 'js': ['static/src/js/view_editor.js'], + 'css': ['static/src/css/view_editor.css'], + 'qweb': ['static/src/xml/view_editor.xml'], 'auto_install': True, } 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 e52a51d125e..e0e3f0f14c5 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -7,7 +7,7 @@ instance.web.ViewManagerAction.include({ current_view = this.views[this.active_view].controller; if(val === "manage_views"){ if (current_view.fields_view && current_view.fields_view.arch) { - var view_editor = new instance.web_view_editor.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch); + var view_editor = new instance.web_view_editor.ViewEditor(current_view, current_view.$el, this.dataset, current_view.fields_view.arch); view_editor.start(); } else { this.do_warn(_t("Manage Views"), @@ -70,7 +70,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ this.view_edit_dialog.on_close.add_last(function(){window.location.reload();}); this.main_view_id = this.parent.fields_view.view_id; this.action_manager = new instance.web.ActionManager(this); - this.action_manager.appendTo(this.view_edit_dialog.$element); + this.action_manager.appendTo(this.view_edit_dialog.$el); $.when(this.action_manager.do_action(action)).then(function() { var viewmanager = self.action_manager.inner_widget; var controller = viewmanager.views[viewmanager.active_view].controller; @@ -116,11 +116,11 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ var view_widget = [{'name': 'view_name', 'string':'View Name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)}, {'name': 'view_type', 'string': 'View Type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]}, {'name': 'proirity', 'string': 'Priority', 'type': 'float', 'required': true, 'value':'16'}]; - this.create_view_dialog.$element.append('<table id="create_view" style="width:400px" class="oe_form"></table>'); + this.create_view_dialog.$el.append('<table id="create_view" style="width:400px" class="oe_form"></table>'); this.create_view_widget = []; _.each(view_widget, function(widget) { var type_widget = new (self.property.get_any([widget.type])) (self.create_view_dialog, widget); - self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td width="100px" align="right">' + widget.string + ':</td>' + type_widget.render()+'</tr>'); + self.create_view_dialog.$el.find('table[id=create_view]').append('<tr><td width="100px" align="right">' + widget.string + ':</td>' + type_widget.render()+'</tr>'); var value = null; if (widget.value) { value = widget.value; @@ -363,8 +363,8 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ }); }, do_select_row: function(row_id) { - this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected'); - this.edit_xml_dialog.$element.find("tr[id=viewedit-" + row_id + "]").addClass('ui-selected'); + this.edit_xml_dialog.$el.find("tr[id^='viewedit-']").removeClass('ui-selected'); + this.edit_xml_dialog.$el.find("tr[id=viewedit-" + row_id + "]").addClass('ui-selected'); }, do_parent_img_hide_show: function(img) { if (_.str.include($(img).attr('src'), '/web/static/src/img/collapse.gif')) { @@ -383,7 +383,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ height: '90%', buttons: [ {text: _t("Inherited View"), click: function(){ - var selected_row = self.edit_xml_dialog.$element.find('.ui-selected'); + var selected_row = self.edit_xml_dialog.$el.find('.ui-selected'); if (selected_row.length) { if(selected_row.find('a').text().search("field") != -1){ if (confirm(_t("Do you really wants to create an inherited view here?"))) { @@ -423,14 +423,14 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ _.each(_PROPERTIES, function(val, key) { if (! val.length) no_property_att.push(key); }); - this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att})); - this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").click(function() { + this.edit_xml_dialog.$el.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att})); + this.edit_xml_dialog.$el.find("tr[id^='viewedit-']").click(function() { self.do_select_row(this.id.split('-')[1]); }); - this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() { + this.edit_xml_dialog.$el.find("img[id^='parentimg-']").click(function() { self.do_parent_img_hide_show(this); }); - this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { + this.edit_xml_dialog.$el.find("img[id^='side-']").click(function() { self.on_select_img(this); }); }, @@ -445,7 +445,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ while (1) { view_find = view_find.prev(); if (view_find.length == 0 || - self.edit_xml_dialog.$element.find(view_find).find('a').text().search("view_id") != -1 && + self.edit_xml_dialog.$el.find(view_find).find('a').text().search("view_id") != -1 && parseInt(view_find.attr('level')) < min_level ) { view_id = parseInt($(view_find).find('a').text().replace(/[^0-9]+/g, '')); break; @@ -477,7 +477,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ self.do_parent_img_hide_show(this); })); } - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-"+row_id+"']").after(clone.removeClass('ui-selected')); _.each(obj.child_id,function(obj){self.render_inherited_view(clone,obj);}); }, @@ -499,7 +499,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ while (1) { view_find = view_find.prev(); if (view_find.length == 0 || - (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 + (self.edit_xml_dialog.$el.find(view_find).find('a').text()).search("view_id") != -1 && parseInt(view_find.attr('level')) < min_level ) { view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); view_xml_id = parseInt((view_find.attr('id')).split('-')[1]); @@ -572,14 +572,14 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ } else { last_tr = cur_tr.next(); } - if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) { + if ((self.edit_xml_dialog.$el.find(last_tr).find('a').text()).search("view_id") != -1) { return false; } if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level) { var last_tr_id = (last_tr.attr('id')).split('-')[1]; img = last_tr.find("img[id='parentimg-" + last_tr_id + "']").attr('src'); if (img) { - self.edit_xml_dialog.$element.find("img[id='parentimg-" + last_tr_id + "']"). + self.edit_xml_dialog.$el.find("img[id='parentimg-" + last_tr_id + "']"). attr('src', '/web/static/src/img/expand.gif'); while (1) { var next_tr = last_tr.next(); @@ -607,7 +607,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ cur_tr = prev_tr; } if (img) { - self.edit_xml_dialog.$element.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']"). + self.edit_xml_dialog.$el.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']"). attr('src', '/web/static/src/img/expand.gif'); while (1) { next_tr = side.next(); @@ -621,7 +621,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ } } if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level && - (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { + (self.edit_xml_dialog.$el.find(last_tr).find('a').text()).search("view_id") == -1) { _.each(tr_to_move, function(rec) { $(last_tr).before(rec); }); @@ -702,13 +702,13 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ }); var new_obj = self.create_View_Node(arch1); new_obj.id = obj.id,new_obj.child_id = obj.child_id; - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-"+this.one_object.clicked_tr_id+"']"). find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); parent = $(arch1).parents(); } else if(move_direct == "add_node") { - var tr_click = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']"), + var tr_click = self.edit_xml_dialog.$el.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']"), temp_xml = QWeb.load_xml(update_values[0]), object_xml = self.create_View_Node(temp_xml.childNodes[0]); (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level; @@ -719,7 +719,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id; switch (update_values[1]) { case "After": - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-"+after_append+"']").after(clone); $(arch1).after($(update_values[0])); child_list.splice(index + 1, 0, object_xml); @@ -738,12 +738,12 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ })); } $(arch1).append($(update_values[0])); - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-"+after_append+"']").after(clone); obj.child_id.push(object_xml); break; } - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected'); parent = $(arch1).parents(); } else if (move_direct == "remove_node") { @@ -755,7 +755,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ } $(arch1).remove(); child_list.splice(index,1); - var cur_tr = self.edit_xml_dialog.$element. + var cur_tr = self.edit_xml_dialog.$el. find("tr[id='viewedit-" + self.one_object.clicked_tr_id + "']"); _.each(self.get_list_tr(cur_tr,self.one_object.clicked_tr_level), function(tr_element){ tr_element.remove(); @@ -765,7 +765,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ return _.include(element.value, self.one_object.clicked_tr_id); }); if(parent_img.value.length == 1){ - self.edit_xml_dialog.$element. + self.edit_xml_dialog.$el. find("tr[id='viewedit-"+parent_img.key+"']"). find("img[id^='parentimg-']").remove(); } @@ -817,7 +817,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ return res.key == id; }); _.each(datas.value, function (rec) { - var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-" + rec + "']"); + var tr = self.edit_xml_dialog.$el.find("tr[id='viewedit-" + rec + "']"); tr.find("img[id='parentimg-" + rec + "']").attr('src', '/web/static/src/img/expand.gif'); tr.show(); }); @@ -891,7 +891,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ 'fonts' : {'name':'fonts', 'string': 'fonts', 'type': 'char'}, }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); - this.edit_node_dialog.$element.append('<table id="rec_table" style="width:400px" class="oe_form"></table>'); + this.edit_node_dialog.$el.append('<table id="rec_table" style="width:400px" class="oe_form"></table>'); this.edit_widget = []; self.ready = $.when(self.on_groups(properties)).then(function () { _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups; @@ -907,7 +907,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ }); value = value instanceof Array ? value[1] : value; - self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + widget.string + ':</td>' + type_widget.render() + '</tr>'); + self.edit_node_dialog.$el.find('table[id=rec_table]').append('<tr><td align="right">' + widget.string + ':</td>' + type_widget.render() + '</tr>'); type_widget.start(); type_widget.set_value(value); self.edit_widget.push(type_widget); @@ -977,8 +977,8 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ {text: _t("Cancel"), click: function() { self.add_node_dialog.close(); }} ] }).open(); - this.add_node_dialog.$element.append('<table id="rec_table" style="width:420px" class="oe_form"><tbody><tr></tbody></table>'); - var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); + this.add_node_dialog.$el.append('<table id="rec_table" style="width:420px" class="oe_form"><tbody><tr></tbody></table>'); + var table_selector = self.add_node_dialog.$el.find('table[id=rec_table] tbody'); _.each(render_list, function(node) { type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node); if (node.name == "position") { @@ -994,7 +994,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ self.add_widget.push(type_widget); }); table_selector.find("td[id^=]").attr("width","100px"); - self.add_node_dialog.$element.find('#new_field').click(function() { + self.add_node_dialog.$el.find('#new_field').click(function() { model_data = new instance.web.DataSetSearch(self,'ir.model', null, null); model_data.read_slice([], {domain: [['model','=', self.model]]}).then(function(result) { self.render_new_field(result[0]); @@ -1022,7 +1022,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ controller.do_save.add_last(function(){ action_manager.destroy(); var value =controller.fields.name.get('value'); - self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value",value).text(value)); + self.add_node_dialog.$el.find('select[id=field_value]').append($("<option selected></option>").attr("value",value).text(value)); _.detect(self.add_widget,function(widget){ widget.name == "field_value"? widget.selection.push(value): false; }); @@ -1032,7 +1032,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ }); instance.web_view_editor.ViewEditor.Field = instance.web.Class.extend({ init: function(view, widget) { - this.$element = view.$element; + this.$el = view.$el; this.dirty = false; this.name = widget.name; this.selection = widget.selection || []; @@ -1045,8 +1045,8 @@ instance.web_view_editor.ViewEditor.Field = instance.web.Class.extend({ this.update_dom(); }, update_dom: function() { - this.$element.find("td[id=" + this.name + "]").toggleClass('invalid', this.is_invalid); - this.$element.find("td[id=" + this.name + "]").toggleClass('required', this.required); + this.$el.find("td[id=" + this.name + "]").toggleClass('invalid', this.is_invalid); + this.$el.find("td[id=" + this.name + "]").toggleClass('required', this.required); }, on_ui_change: function() { this.validate(); @@ -1071,17 +1071,17 @@ instance.web_view_editor.ViewEditor.FieldBoolean = instance.web_view_editor.View start: function() { var self = this; this._super(); - this.$element.find("input[id="+ self.name+"]").change(function() { + this.$el.find("input[id="+ self.name+"]").change(function() { self.on_ui_change(); }); }, set_value: function(value) { if (value) { - this.$element.find("input[id=" + this.name+ "]").attr('checked', true); + this.$el.find("input[id=" + this.name+ "]").attr('checked', true); } }, get_value: function() { - return this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null; + return this.$el.find("input[id=" + this.name + "]").is(':checked')? "1" : null; } }); instance.web_view_editor.ViewEditor.FieldChar = instance.web_view_editor.ViewEditor.Field.extend({ @@ -1089,15 +1089,15 @@ instance.web_view_editor.ViewEditor.FieldChar = instance.web_view_editor.ViewEdi start: function () { var self = this; this._super(); - this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() { + this.$el.find("input[id="+ this.name+"]").css('width','100%').change(function() { self.on_ui_change(); }); }, set_value: function(value) { - this.$element.find("input[id=" + this.name + "]").val(value); + this.$el.find("input[id=" + this.name + "]").val(value); }, get_value: function() { - return this.$element.find("input[id=" + this.name + "]").val(); + return this.$el.find("input[id=" + this.name + "]").val(); } }); instance.web_view_editor.ViewEditor.FieldSelect = instance.web_view_editor.ViewEditor.Field.extend({ @@ -1105,15 +1105,15 @@ instance.web_view_editor.ViewEditor.FieldSelect = instance.web_view_editor.ViewE start: function () { var self = this; this._super(); - this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { + this.$el.find("select[id=" + this.name + "]").css('width', '100%').change(function() { self.on_ui_change(); if (self.name == "node_type") { if (self.get_value() == "field") { - self.$element.find('#new_field').show(); - self.$element.find("select[id=field_value]").show(); + self.$el.find('#new_field').show(); + self.$el.find("select[id=field_value]").show(); } else { - self.$element.find('#new_field').hide(); - self.$element.find("select[id=field_value]").hide(); + self.$el.find('#new_field').hide(); + self.$el.find("select[id=field_value]").hide(); } } }); @@ -1124,24 +1124,24 @@ instance.web_view_editor.ViewEditor.FieldSelect = instance.web_view_editor.ViewE for (var i = 0, ii = this.selection.length; i < ii; i++) { if ((this.selection[i] instanceof Array && this.selection[i][0] === value) || this.selection[i] === value) index = i; } - this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index; + this.$el.find("select[id=" + this.name + "]")[0].selectedIndex = index; }, get_value: function() { - return this.$element.find("select[id=" + this.name + "]").val(); + return this.$el.find("select[id=" + this.name + "]").val(); } }); instance.web_view_editor.ViewEditor.FieldSelectMulti = instance.web_view_editor.ViewEditor.FieldSelect.extend({ start: function () { this._super(); - this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true); + this.$el.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true); }, set_value: function(value) { var self = this; - self.$element.find("#groups option").attr("selected",false); + self.$el.find("#groups option").attr("selected",false); if (!value) return false; _.each(this.selection, function(item) { if (_.include(value.split(','), item[0])) { - self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1) + self.$el.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1) } }); } |