diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-05-05 10:02:33 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-05-05 10:02:33 +0530 |
| commit | e41508cb8d7fd2a2c06e3fab9ce1503e8efa30fa (patch) | |
| tree | 8e0fbb849cebc9b3ac0f87355a5248f51826a491 | |
| parent | 4312b921f3db41529cbd4f501a6b5dcba2bebd08 (diff) | |
| parent | 8fbebfd752fa8933584711522675d354b3217839 (diff) | |
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
406 files changed, 1112 insertions, 1909 deletions
diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 5941a6aa5b0..a4000856afe 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -14,81 +14,7 @@ This module provides the core of the OpenERP Web Client. 'data': [ 'views/webclient_templates.xml', ], - 'js': [ - "static/lib/es5-shim/es5-shim.min.js", - "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.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.autosize/jquery.autosize.js", - "static/lib/jquery.blockUI/jquery.blockUI.js", - "static/lib/jquery.hotkeys/jquery.hotkeys.js", - "static/lib/jquery.placeholder/jquery.placeholder.js", - "static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.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.textext/jquery.textext.js", - "static/lib/jquery.timeago/jquery.timeago.js", - "static/lib/bootstrap/js/bootstrap.js", - "static/lib/qweb/qweb2.js", - "static/lib/underscore/underscore.js", - "static/lib/underscore.string/lib/underscore.string.js", - "static/lib/backbone/backbone.js", - "static/lib/cleditor/jquery.cleditor.js", - "static/lib/py.js/lib/py.js", - "static/lib/select2/select2.js", - "static/src/js/openerpframework.js", - "static/src/js/boot.js", - "static/src/js/testing.js", - "static/src/js/pyeval.js", - "static/src/js/core.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/search.js", - "static/src/js/view_list.js", - "static/src/js/view_form.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.9.0.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.textext/jquery.textext.css", - "static/lib/fontawesome/css/font-awesome.css", - "static/lib/bootstrap/css/bootstrap.css", - "static/lib/select2/select2.css", - "static/src/css/base.css", - "static/src/css/data_export.css", - "static/lib/cleditor/jquery.cleditor.css", - ], 'qweb' : [ "static/src/xml/*.xml", ], - 'test': [ - "static/test/testing.js", - "static/test/framework.js", - "static/test/registry.js", - "static/test/form.js", - "static/test/data.js", - "static/test/list-utils.js", - "static/test/formats.js", - "static/test/rpc-misordered.js", - "static/test/evals.js", - "static/test/search.js", - "static/test/list.js", - "static/test/list-editable.js", - "static/test/mutex.js" - ], } diff --git a/addons/web/controllers/__init__.py b/addons/web/controllers/__init__.py index 74c27518ece..12a7e529b67 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -1,2 +1 @@ from . import main -from . import testing diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index f2101b27fd3..6dcc069fcc2 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -31,6 +31,7 @@ except ImportError: import openerp import openerp.modules.registry +from openerp.addons.base.ir.ir_qweb import AssetsBundle, QWebTemplateNotFound from openerp.tools.translate import _ from openerp import http @@ -52,50 +53,6 @@ env.filters["json"] = simplejson.dumps # OpenERP Web helpers #---------------------------------------------------------- -def rjsmin(script): - """ Minify js with a clever regex. - Taken from http://opensource.perlig.de/rjsmin - Apache License, Version 2.0 """ - def subber(match): - """ Substitution callback """ - groups = match.groups() - return ( - groups[0] or - groups[1] or - groups[2] or - groups[3] or - (groups[4] and '\n') or - (groups[5] and ' ') or - (groups[6] and ' ') or - (groups[7] and ' ') or - '' - ) - - result = re.sub( - r'([^\047"/\000-\040]+)|((?:(?:\047[^\047\\\r\n]*(?:\\(?:[^\r\n]|\r?' - r'\n|\r)[^\047\\\r\n]*)*\047)|(?:"[^"\\\r\n]*(?:\\(?:[^\r\n]|\r?\n|' - r'\r)[^"\\\r\n]*)*"))[^\047"/\000-\040]*)|(?:(?<=[(,=:\[!&|?{};\r\n]' - r')(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/' - r'))*((?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n]*' - r'(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/\\\[\r\n]*)*/)[^\047"/\000-\040]*' - r'))|(?:(?<=[\000-#%-,./:-@\[-^`{-~-]return)(?:[\000-\011\013\014\01' - r'6-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*((?:/(?![\r\n/*])[^/' - r'\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]' - r'*)*\]))[^/\\\[\r\n]*)*/)[^\047"/\000-\040]*))|(?<=[^\000-!#%&(*,./' - r':-@\[\\^`{|~])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/' - r'*][^*]*\*+)*/))*(?:((?:(?://[^\r\n]*)?[\r\n]))(?:[\000-\011\013\01' - r'4\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000-\040"#' - r'%-\047)*,./:-@\\-^`|-~])|(?<=[^\000-#%-,./:-@\[-^`{-~-])((?:[\000-' - r'\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=[^' - r'\000-#%-,./:-@\[-^`{-~-])|(?<=\+)((?:[\000-\011\013\014\016-\040]|' - r'(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=\+)|(?<=-)((?:[\000-\011\0' - r'13\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=-)|(?:[\0' - r'00-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))+|(?:' - r'(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*' - r']*\*+(?:[^/*][^*]*\*+)*/))*)+', subber, '\n%s\n' % script - ).strip() - return result - db_list = http.db_list db_monodb = http.db_monodb @@ -309,45 +266,6 @@ def concat_xml(file_list): root.append(child) return ElementTree.tostring(root, 'utf-8'), checksum.hexdigest() -def concat_files(file_list, reader=None, intersperse=""): - """ Concatenates contents of all provided files - - :param list(str) file_list: list of files to check - :param function reader: reading procedure for each file - :param str intersperse: string to intersperse between file contents - :returns: (concatenation_result, checksum) - :rtype: (str, str) - """ - checksum = hashlib.new('sha1') - if not file_list: - return '', checksum.hexdigest() - - if reader is None: - def reader(f): - import codecs - with codecs.open(f, 'rb', "utf-8-sig") as fp: - return fp.read().encode("utf-8") - - files_content = [] - for fname in file_list: - contents = reader(fname) - checksum.update(contents) - files_content.append(contents) - - files_concat = intersperse.join(files_content) - return files_concat, checksum.hexdigest() - -concat_js_cache = {} - -def concat_js(file_list): - content, checksum = concat_files(file_list, intersperse=';') - if checksum in concat_js_cache: - content = concat_js_cache[checksum] - else: - content = rjsmin(content) - concat_js_cache[checksum] = content - return content, checksum - def fs2web(path): """convert FS path into web path""" return '/'.join(path.split(os.path.sep)) @@ -371,30 +289,17 @@ def manifest_glob(extension, addons=None, db=None, include_remotes=False): r.append((None, pattern)) else: for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))): - # Hack for IE, who limit 288Ko, 4095 rules, 31 sheets - # http://support.microsoft.com/kb/262161/en - if pattern == "static/lib/bootstrap/css/bootstrap.css": - if include_remotes: - r.insert(0, (None, fs2web(path[len(addons_path):]))) - else: - r.append((path, fs2web(path[len(addons_path):]))) + r.append((path, fs2web(path[len(addons_path):]))) return r -def manifest_list(extension, mods=None, db=None, debug=False): +def manifest_list(extension, mods=None, db=None, debug=None): """ list ressources to load specifying either: mods: a comma separated string listing modules db: a database name (return all installed modules in that database) """ + if debug is not None: + _logger.warning("openerp.addons.web.main.manifest_list(): debug parameter is deprecated") files = manifest_glob(extension, addons=mods, db=db, include_remotes=True) - if not debug: - path = '/web/webclient/' + extension - if mods is not None: - path += '?' + werkzeug.url_encode({'mods': mods}) - elif db: - path += '?' + werkzeug.url_encode({'db': db}) - - remotes = [wp for fp, wp in files if fp is None] - return [path] + remotes return [wp for _fp, wp in files] def get_last_modified(files): @@ -411,7 +316,7 @@ def get_last_modified(files): for f in files) return datetime.datetime(1970, 1, 1) -def make_conditional(response, last_modified=None, etag=None): +def make_conditional(response, last_modified=None, etag=None, max_age=0): """ Makes the provided response conditional based upon the request, and mandates revalidation from clients @@ -426,7 +331,7 @@ def make_conditional(response, last_modified=None, etag=None): :rtype: werkzeug.wrappers.Response """ response.cache_control.must_revalidate = True - response.cache_control.max_age = 0 + response.cache_control.max_age = max_age if last_modified: response.last_modified = last_modified if etag: @@ -603,6 +508,7 @@ html_template = """<!DOCTYPE html> <title>OpenERP</title> <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> <link rel="stylesheet" href="/web/static/src/css/full.css" /> + %(css)s %(js)s <script type="text/javascript"> @@ -621,26 +527,16 @@ html_template = """<!DOCTYPE html> </html> """ -def render_bootstrap_template(template, values=None, debug=False, db=None, **kw): - if not db: - db = request.db - if request.debug: - debug = True +def render_bootstrap_template(template, values=None, **kw): if values is None: - values = {} - values['debug'] = debug - values['current_db'] = db + values = dict() try: values['databases'] = http.db_list() except openerp.exceptions.AccessDenied: values['databases'] = None - for res in ['js', 'css']: - if res not in values: - values[res] = manifest_list(res, db=db, debug=debug) - if 'modules' not in values: - values['modules'] = module_boot(db=db) + values['modules'] = module_boot() values['modules'] = simplejson.dumps(values['modules']) return request.render(template, values, **kw) @@ -682,9 +578,11 @@ class Home(http.Controller): redirect = '/web?' + request.httprequest.query_string values['redirect'] = redirect if request.httprequest.method == 'POST': + old_uid = request.uid uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password']) if uid is not False: return http.redirect_with_hash(redirect) + request.uid = old_uid values['error'] = "Wrong login/password" return render_bootstrap_template('web.login', values) @@ -692,83 +590,47 @@ class Home(http.Controller): def login(self, db, login, key, redirect="/web", **kw): return login_and_redirect(db, login, key, redirect_url=redirect) -class WebClient(http.Controller): - - @http.route('/web/webclient/csslist', type='json', auth="none") - def csslist(self, mods=None): - return manifest_list('css', mods=mods) - - @http.route('/web/webclient/jslist', type='json', auth="none") - def jslist(self, mods=None): - return manifest_list('js', mods=mods) - - @http.route('/web/webclient/qweblist', type='json', auth="none") - def qweblist(self, mods=None): - return manifest_list('qweb', mods=mods) - - @http.route('/web/webclient/css', type='http', auth="none") - def css(self, mods=None, db=None): - files = list(manifest_glob('css', addons=mods, db=db)) - last_modified = get_last_modified(f[0] for f in files) - if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= last_modified: - return werkzeug.wrappers.Response(status=304) - - file_map = dict(files) - - rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U) - rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U) - - def reader(f): - """read the a css file and absolutify all relative uris""" - with open(f, 'rb') as fp: - data = fp.read().decode('utf-8') - - path = file_map[f] - web_dir = os.path.dirname(path) - - data = re.sub( - rx_import, - r"""@import \1%s/""" % (web_dir,), - data, - ) - - data = re.sub( - rx_url, - r"url(\1%s/" % (web_dir,), - data, - ) - return data.encode('utf-8') + @http.route('/web/js/<xmlid>', type='http', auth="public") + def js_bundle(self, xmlid, **kw): + # manifest backward compatible mode, to be removed + values = {'manifest_list': manifest_list} + try: + assets_html = request.render(xmlid, lazy=False, qcontext=values) + except QWebTemplateNotFound: + return request.not_found() + bundle = AssetsBundle(xmlid, assets_html, debug=request.debug) - content, checksum = concat_files((f[0] for f in files), reader) + response = request.make_response( + bundle.js(), [('Content-Type', 'application/javascript')]) - # move up all @import and @charset rules to the top - matches = [] - def push(matchobj): - matches.append(matchobj.group(0)) - return '' + # TODO: check that we don't do weird lazy overriding of __call__ which break body-removal + return make_conditional( + response, bundle.last_modified, bundle.checksum, max_age=60*60*24) - content = re.sub(re.compile("(@charset.+;$)", re.M), push, content) - content = re.sub(re.compile("(@import.+;$)", re.M), push, content) + @http.route('/web/css/<xmlid>', type='http', auth='public') + def css_bundle(self, xmlid, **kw): + values = {'manifest_list': manifest_list} # manifest backward compatible mode, to be removed + try: + assets_html = request.render(xmlid, lazy=False, qcontext=values) + except QWebTemplateNotFound: + return request.not_found() + bundle = AssetsBundle(xmlid, assets_html, debug=request.debug) - matches.append(content) - content = '\n'.join(matches) + response = request.make_response( + bundle.css(), [('Content-Type', 'text/css')]) return make_conditional( - request.make_response(content, [('Content-Type', 'text/css')]), - last_modified, checksum) + response, bundle.last_modified, bundle.checksum, max_age=60*60*24) - @http.route('/web/webclient/js', type='http', auth="none") - def js(self, mods=None, db=None): - files = [f[0] for f in manifest_glob('js', addons=mods, db=db)] - last_modified = get_last_modified(files) - if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= last_modified: - return werkzeug.wrappers.Response(status=304) +class WebClient(http.Controller): - content, checksum = concat_js(files) + @http.route('/web/webclient/csslist', type='json', auth="none") + def csslist(self, mods=None): + return manifest_list('css', mods=mods) - return make_conditional( - request.make_response(content, [('Content-Type', 'application/javascript')]), - last_modified, checksum) + @http.route('/web/webclient/jslist', type='json', auth="none") + def jslist(self, mods=None): + return manifest_list('js', mods=mods) @http.route('/web/webclient/qweb', type='http', auth="none") def qweb(self, mods=None, db=None): @@ -843,6 +705,10 @@ class WebClient(http.Controller): def version_info(self): return openerp.service.common.exp_version() + @http.route('/web/tests', type='http', auth="none") + def index(self, mod=None, **kwargs): + return request.render('web.qunit_suite') + class Proxy(http.Controller): @http.route('/web/proxy/load', type='json', auth="none") @@ -879,8 +745,64 @@ class Database(http.Controller): def manager(self, **kw): # TODO: migrate the webclient's database manager to server side views request.session.logout() - js = "\n ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', debug=request.debug)) - css = "\n ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', debug=request.debug)) + css = """ + <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/> + <link href="/web/static/lib/cleditor/jquery.cleditor.css" rel="stylesheet"/> + <link href="/web/static/lib/jquery.textext/jquery.textext.css" rel="stylesheet"/> + <link href="/web/static/lib/select2/select2.css" rel="stylesheet"/> + <link href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css" rel="stylesheet"/> + <link href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css" rel="stylesheet"/> + <link href="/web/static/lib/jquery.ui.notify/css/ui.notify.css" rel="stylesheet"/> + <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/> + <link href="/web/static/src/css/base.css" rel="stylesheet"/> + <link href="/web/static/src/css/data_export.css" rel="stylesheet"/> + <link href="/base/static/src/css/modules.css" rel="stylesheet"/>""" + js = """ + <script src="/web/static/lib/es5-shim/es5-shim.min.js" type="text/javascript"></script> + <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script> + <script src="/web/static/lib/underscore.string/lib/underscore.string.js" type="text/javascript"></script> + <script src="/web/static/lib/datejs/globalization/en-US.js" type="text/javascript"></script> + <script src="/web/static/lib/spinjs/spin.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.blockUI/jquery.blockUI.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.placeholder/jquery.placeholder.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.timeago/jquery.timeago.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.form/jquery.form.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js" type="text/javascript"></script> + <script src="/web/static/lib/datejs/core.js" type="text/javascript"></script> + <script src="/web/static/lib/datejs/parser.js" type="text/javascript"></script> + <script src="/web/static/lib/datejs/sugarpak.js" type="text/javascript"></script> + <script src="/web/static/lib/datejs/extras.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.validate/jquery.validate.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.autosize/jquery.autosize.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js" type="text/javascript"></script> + <script src="/web/static/lib/cleditor/jquery.cleditor.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.textext/jquery.textext.js" type="text/javascript"></script> + <script src="/web/static/lib/select2/select2.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script> + <script src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js" type="text/javascript"></script> + <script src="/web/static/lib/bootstrap/js/bootstrap.js" type="text/javascript"></script> + <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script> + <script src="/web/static/lib/qweb/qweb2.js" type="text/javascript"></script> + <script src="/web/static/src/js/openerpframework.js" type="text/javascript"></script> + <script src="/web/static/lib/py.js/lib/py.js" type="text/javascript"></script> + <script src="/web/static/src/js/boot.js" type="text/javascript"></script> + <script src="/web/static/src/js/testing.js" type="text/javascript"></script> + <script src="/web/static/src/js/pyeval.js" type="text/javascript"></script> + <script src="/web/static/src/js/core.js" type="text/javascript"></script> + <script src="/web/static/src/js/formats.js" type="text/javascript"></script> + <script src="/web/static/src/js/chrome.js" type="text/javascript"></script> + <script src="/web/static/src/js/views.js" type="text/javascript"></script> + <script src="/web/static/src/js/data.js" type="text/javascript"></script> + <script src="/web/static/src/js/data_export.js" type="text/javascript"></script> + <script src="/web/static/src/js/search.js" type="text/javascript"></script> + <script src="/web/static/src/js/view_list.js" type="text/javascript"></script> + <script src="/web/static/src/js/view_form.js" type="text/javascript"></script> + <script src="/web/static/src/js/view_list_editable.js" type="text/javascript"></script> + <script src="/web/static/src/js/view_tree.js" type="text/javascript"></script> + <script src="/base/static/src/js/apps.js" type="text/javascript"></script>""" r = html_template % { 'js': js, @@ -1088,16 +1010,7 @@ class Menu(http.Controller): """ s = request.session Menus = s.model('ir.ui.menu') - # If a menu action is defined use its domain to get the root menu items - user_menu_id = s.model('res.users').read([s.uid], ['menu_id'], - request.context)[0]['menu_id'] - menu_domain = [('parent_id', '=', False)] - if user_menu_id: - domain_string = s.model('ir.actions.act_window').read( - [user_menu_id[0]], ['domain'],request.context)[0]['domain'] - if domain_string: - menu_domain = ast.literal_eval(domain_string) return Menus.search(menu_domain, 0, False, False, request.context) diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py deleted file mode 100644 index a51b619d49f..00000000000 --- a/addons/web/controllers/testing.py +++ /dev/null @@ -1,159 +0,0 @@ -# coding=utf-8 -# -*- encoding: utf-8 -*- - -import glob -import itertools -import json -import operator -import os - -from mako.template import Template -from openerp.modules import module -from openerp import http -from openerp.http import request - -from .main import module_topological_sort - -NOMODULE_TEMPLATE = Template(u"""<!DOCTYPE html> -<html> - <head> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP Testing</title> - </head> - <body> - <form action="/web/tests" method="GET"> - <button name="mod" value="*">Run all tests</button> - <ul> - % for name, module in modules: - <li>${name} <button name="mod" value="${module}"> - Run Tests</button></li> - % endfor - </ul> - </form> - </body> -</html> -""", default_filters=['h']) -NOTFOUND = Template(u""" -<p>Unable to find the module [${module}], please check that the module - name is correct and the module is on OpenERP's path.</p> -<a href="/web/tests"><< Back to tests</a> -""", default_filters=['h']) -TESTING = Template(u"""<!DOCTYPE html> -<html style="height: 100%"> -<%def name="to_path(module, p)">/${module}/${p}</%def> -<head> - <meta http-equiv="X-UA-Compatible" content="IE=edge"/> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP Web Tests</title> - <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> - - <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"> - <script src="/web/static/lib/qunit/qunit.js"></script> - - <script type="text/javascript"> - // List of modules, each module is preceded by its dependencies - var oe_all_dependencies = ${dependencies | n}; - QUnit.config.testTimeout = 5 * 60 * 1000; - </script> -</head> -<body id="oe" class="openerp"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> -</body> -<!-- TODO xmo please use the regular template even for testing --> -% for module, jss, tests, templates in files: - % for js in jss: - % if not js.endswith('/apps.js'): - <script src="${to_path(module, js)}"></script> - % endif - % endfor - % if tests or templates: - <script> - openerp.testing.current_module = "${module}"; - % for template in templates: - openerp.testing.add_template("${to_path(module, template)}"); - % endfor - </script> - % endif - % if tests: - % for test in tests: - <script type="text/javascript" src="${to_path(module, test)}"></script> - % endfor - % endif -% endfor -</html> -""", default_filters=['h']) - -class TestRunnerController(http.Controller): - - @http.route('/web/tests', type='http', auth="none") - def index(self, mod=None, **kwargs): - ms = module.get_modules() - manifests = dict( - (name, desc) - for name, desc in zip(ms, map(self.load_manifest, ms)) - if desc # remove not-actually-openerp-modules - ) - - if not mod: - return NOMODULE_TEMPLATE.render(modules=( - (manifest['name'], name) - for name, manifest in manifests.iteritems() - if any(testfile.endswith('.js') - for testfile in manifest['test']) - )) - sorted_mods = module_topological_sort(dict( - (name, manifest.get('depends', [])) - for name, manifest in manifests.iteritems() - )) - # to_load and to_test should be zippable lists of the same length. - # A falsy value in to_test indicate nothing to test at that index (just - # load the corresponding part of to_load) - to_test = sorted_mods - if mod != '*': - if mod not in manifests: - return request.not_found(NOTFOUND.render(module=mod)) - idx = sorted_mods.index(mod) - to_test = [None] * len(sorted_mods) - to_test[idx] = mod - - tests_candicates = [ - filter(lambda path: path.endswith('.js'), - manifests[mod]['test'] if mod else []) - for mod in to_test] - # remove trailing test-less modules - tests = reversed(list( - itertools.dropwhile( - operator.not_, - reversed(tests_candicates)))) - - files = [ - (mod, manifests[mod]['js'], tests, manifests[mod]['qweb']) - for mod, tests in itertools.izip(sorted_mods, tests) - ] - - return TESTING.render(files=files, dependencies=json.dumps( - [name for name in sorted_mods - if module.get_module_resource(name, 'static') - if manifests[name]['js']])) - - def load_manifest(self, name): - manifest = module.load_information_from_description_file(name) - if manifest: - path = module.get_module_path(name) - manifest['js'] = list( - self.expand_patterns(path, manifest.get('js', []))) - manifest['test'] = list( - self.expand_patterns(path, manifest.get('test', []))) - manifest['qweb'] = list( - self.expand_patterns(path, manifest.get('qweb', []))) - return manifest - - def expand_patterns(self, root, patterns): - for pattern in patterns: - normalized_pattern = os.path.normpath(os.path.join(root, pattern)) - for path in glob.glob(normalized_pattern): - # replace OS path separators (from join & normpath) by URI ones - yield path[len(root):].replace(os.path.sep, '/') - diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po index 4b2083866bc..5500e9103f1 100644 --- a/addons/web/i18n/ar.po +++ b/addons/web/i18n/ar.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po index 4877f186483..8cfebbfe61f 100644 --- a/addons/web/i18n/bg.po +++ b/addons/web/i18n/bg.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po index a2e1317df9f..b2aa1b04340 100644 --- a/addons/web/i18n/bn.po +++ b/addons/web/i18n/bn.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po index 3cfb2e85bdf..b35ac75513d 100644 --- a/addons/web/i18n/bs.po +++ b/addons/web/i18n/bs.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po index 0e1fe377fa3..5a772e2ca2f 100644 --- a/addons/web/i18n/ca.po +++ b/addons/web/i18n/ca.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po index 4dac86f7964..acd387fa39a 100644 --- a/addons/web/i18n/cs.po +++ b/addons/web/i18n/cs.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po index 758400611c0..8bf7a9f5086 100644 --- a/addons/web/i18n/da.po +++ b/addons/web/i18n/da.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po index b3aa01c56fd..cb5f6fa9e6e 100644 --- a/addons/web/i18n/de.po +++ b/addons/web/i18n/de.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po index 01509d52bbf..f92d5c282b3 100644 --- a/addons/web/i18n/en_AU.po +++ b/addons/web/i18n/en_AU.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po index bd0a20a5f7a..88f6a33907f 100644 --- a/addons/web/i18n/en_GB.po +++ b/addons/web/i18n/en_GB.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index 2b9303e87a4..52e1f5dbadf 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po index bc342c8bcd0..d54195b2ffe 100644 --- a/addons/web/i18n/es_CL.po +++ b/addons/web/i18n/es_CL.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po index 0ef3e7a0975..862531a7b68 100644 --- a/addons/web/i18n/es_CR.po +++ b/addons/web/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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" "Language: es\n" diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po index 86d6f43f20d..96e28c1ae9d 100644 --- a/addons/web/i18n/es_DO.po +++ b/addons/web/i18n/es_DO.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po index c4fa890182f..e634ab5c076 100644 --- a/addons/web/i18n/es_EC.po +++ b/addons/web/i18n/es_EC.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po index 84298e0bce1..ec8bf391953 100644 --- a/addons/web/i18n/es_MX.po +++ b/addons/web/i18n/es_MX.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po index 3ec2d60e5bb..71d37a83395 100644 --- a/addons/web/i18n/es_PE.po +++ b/addons/web/i18n/es_PE.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po index b55354266a8..6efd5e392d3 100644 --- a/addons/web/i18n/et.po +++ b/addons/web/i18n/et.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po index 4e059ff6b09..b29f74e3b76 100644 --- a/addons/web/i18n/eu.po +++ b/addons/web/i18n/eu.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po index 309ac285423..c190534f18c 100644 --- a/addons/web/i18n/fa.po +++ b/addons/web/i18n/fa.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po index 821429ebae1..827eb9edac0 100644 --- a/addons/web/i18n/fi.po +++ b/addons/web/i18n/fi.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po index d4efe82bbcf..5cc8a8785a1 100644 --- a/addons/web/i18n/fr.po +++ b/addons/web/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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po index 840dfb3b07e..5860eea177e 100644 --- a/addons/web/i18n/fr_CA.po +++ b/addons/web/i18n/fr_CA.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po index 07f34b44994..108125b647c 100644 --- a/addons/web/i18n/gl.po +++ b/addons/web/i18n/gl.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po index dbcbf6bab93..5e064c2f121 100644 --- a/addons/web/i18n/gu.po +++ b/addons/web/i18n/gu.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/he.po b/addons/web/i18n/he.po index b9f64d0585c..6982efa679a 100644 --- a/addons/web/i18n/he.po +++ b/addons/web/i18n/he.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po index 0db5502ce67..b8d43b0547c 100644 --- a/addons/web/i18n/hi.po +++ b/addons/web/i18n/hi.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po index 375bd8d6a12..d47cefc95d3 100644 --- a/addons/web/i18n/hr.po +++ b/addons/web/i18n/hr.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po index e710ce1d9d9..f1a92ab0186 100644 --- a/addons/web/i18n/hu.po +++ b/addons/web/i18n/hu.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po index 86a783057cf..ecc7f580c42 100644 --- a/addons/web/i18n/id.po +++ b/addons/web/i18n/id.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po index 124054cea6b..e37592a6b89 100644 --- a/addons/web/i18n/it.po +++ b/addons/web/i18n/it.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po index 7c80f9b942a..81fa526f501 100644 --- a/addons/web/i18n/ja.po +++ b/addons/web/i18n/ja.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po index b13eefea7f6..bbfbdad689e 100644 --- a/addons/web/i18n/ka.po +++ b/addons/web/i18n/ka.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po index 7788c990963..c2445599c55 100644 --- a/addons/web/i18n/ko.po +++ b/addons/web/i18n/ko.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po index 4559a6b28d5..8f4bf33bcd1 100644 --- a/addons/web/i18n/lo.po +++ b/addons/web/i18n/lo.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po index afbd9a9e1d6..384a22b5d7a 100644 --- a/addons/web/i18n/lt.po +++ b/addons/web/i18n/lt.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po index e32d8f57708..a1358f54205 100644 --- a/addons/web/i18n/lv.po +++ b/addons/web/i18n/lv.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po index 1faa1f5a07c..70d9144d92f 100644 --- a/addons/web/i18n/mk.po +++ b/addons/web/i18n/mk.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po index f9853570da9..09694dae1c4 100644 --- a/addons/web/i18n/mn.po +++ b/addons/web/i18n/mn.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po index 9a2545585b2..7ff320014f4 100644 --- a/addons/web/i18n/nb.po +++ b/addons/web/i18n/nb.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po index c55799ac9cb..3f1e2d7c5ac 100644 --- a/addons/web/i18n/nl.po +++ b/addons/web/i18n/nl.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po index dc52a1a7d67..f6dc9d6f34f 100644 --- a/addons/web/i18n/nl_BE.po +++ b/addons/web/i18n/nl_BE.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po index 8ee646f2dc7..df2dd4def17 100644 --- a/addons/web/i18n/pl.po +++ b/addons/web/i18n/pl.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po index 6d781d7454e..a1716f3b7b0 100644 --- a/addons/web/i18n/pt.po +++ b/addons/web/i18n/pt.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po index 1e0d6547806..c9e6cfab751 100644 --- a/addons/web/i18n/pt_BR.po +++ b/addons/web/i18n/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po index 9b5aa45f1ca..2285aa1ec28 100644 --- a/addons/web/i18n/ro.po +++ b/addons/web/i18n/ro.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po index 7b6ad85b2d3..7ab615d6312 100644 --- a/addons/web/i18n/ru.po +++ b/addons/web/i18n/ru.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: 2014-04-18 06:39+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po index e191a83103e..e1ad376ba14 100644 --- a/addons/web/i18n/sk.po +++ b/addons/web/i18n/sk.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po index e0d7ae00ef5..6c7dc176481 100644 --- a/addons/web/i18n/sl.po +++ b/addons/web/i18n/sl.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po index 3309d32e981..1e338e967a5 100644 --- a/addons/web/i18n/sq.po +++ b/addons/web/i18n/sq.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: 2014-04-18 06:38+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po index 733c2defc8f..88d941461c7 100644 --- a/addons/web/i18n/sr@latin.po +++ b/addons/web/i18n/sr@latin.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po index 561fb58b765..9847bdf1ffe 100644 --- a/addons/web/i18n/sv.po +++ b/addons/web/i18n/sv.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po index 9ea50242c2b..d61e828b1a7 100644 --- a/addons/web/i18n/th.po +++ b/addons/web/i18n/th.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po index dff19630d9e..4decaa7f356 100644 --- a/addons/web/i18n/tr.po +++ b/addons/web/i18n/tr.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po index 547d9eb3b72..92826b245bc 100644 --- a/addons/web/i18n/uk.po +++ b/addons/web/i18n/uk.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po index a6fadf0ae53..6eef5cbad3c 100644 --- a/addons/web/i18n/vi.po +++ b/addons/web/i18n/vi.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index 2f6ded3b9b0..9bfc9ed283a 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po index 06ab836e14f..80de08053cb 100644 --- a/addons/web/i18n/zh_TW.po +++ b/addons/web/i18n/zh_TW.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css index 7fa0e6f467b..35da66e7484 100644 --- a/addons/web/static/lib/fontawesome/css/font-awesome.css +++ b/addons/web/static/lib/fontawesome/css/font-awesome.css @@ -207,6 +207,9 @@ .fa-star:before { content: "\f005"; } +. fa-tasks:before { + content: "\f0ae"; +} .fa-star-o:before { content: "\f006"; } @@ -237,6 +240,12 @@ .fa-search-minus:before { content: "\f010"; } +.fa-adn:before { + content: "\f170"; +} +. fa-times:before { + content: "\f00d"; +} .fa-power-off:before { content: "\f011"; } @@ -308,6 +317,9 @@ .fa-qrcode:before { content: "\f029"; } +.fa-calendar:before { + content: "\f073"; +} .fa-barcode:before { content: "\f02a"; } @@ -759,6 +771,9 @@ .fa-pinterest:before { content: "\f0d2"; } +.fa-pencil-square-o:before { + content: "\f044"; +} .fa-pinterest-square:before { content: "\f0d3"; } diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 916e4ffe9ba..8534927def1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -79,7 +79,7 @@ vertical-align: top; } .openerp .oe_title { - width: 50%; + width: 38%; float: left; } .openerp .oe_title:after { @@ -314,56 +314,58 @@ .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover { background: #ed6f6a; } -.openerp .oe_button_box { - width: 400px; - text-align: left; -} -.openerp .oe_button_box .oe_stat_button:hover { - background: #7c7bad; - color: white; -} -.openerp .oe_button_box .oe_stat_button:hover .fa { - color: white; -} -.openerp .oe_button_box .oe_stat_button { +.openerp .oe_stat_button { font-weight: normal; - display: inline-table; - width: 33% !important; - height: 42px; + width: 132px !important; + height: 40px; + color: #666666; margin: 0px -1px -1px 0px; padding: 0; - color: #666666; border: 1px solid #dddddd; border-radius: 0; box-shadow: none; background: white; } -.openerp .oe_button_box .oe_stat_button > div { +.openerp .oe_stat_button > div { display: table-cell; vertical-align: middle; text-align: left; padding: 0; line-height: 120%; } -.openerp .oe_button_box .oe_stat_button .stat_button_icon { +.openerp .oe_stat_button .stat_button_icon { color: #7c7bad; font-size: 24px; padding: 0px 3px; width: 37px; text-align: center; } -.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie { +.openerp .oe_stat_button .oe_form_field_percent_pie { width: 42px; } -.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart { +.openerp .oe_stat_button .oe_form_field_bar_chart { width: 42px; } -.openerp .oe_button_box .oe_stat_button svg { +.openerp .oe_stat_button svg { width: 38px; height: 38px; display: inline; vertical-align: middle; } +.openerp .oe_stat_button:hover { + background: #7c7bad; + color: white; +} +.openerp .oe_stat_button:hover .fa { + color: white; +} +.openerp .oe_button_box { + width: 400px; + text-align: right; +} +.openerp .oe_button_box .oe_stat_button { + display: inline-table; +} .openerp .oe_avatar > img { max-height: 90px; max-width: 90px; @@ -720,7 +722,7 @@ border-bottom-left-radius: 8px; } .openerp .oe_notification { - z-index: 1050; + z-index: 1500; } .openerp .oe_webclient_timezone_notification a { color: white; @@ -2742,13 +2744,15 @@ padding: 3px 6px; white-space: pre-line; } -.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img { +.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; padding: 0; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +} +.openerp .oe_list_content > tbody > tr > td > button.btn_txt, .openerp .oe_list_content > tbody > tr > th > button.btn_txt { + border: 1px solid rgba(0, 0, 0, 0.4); + background: #e3e3e3; + padding: 3px 12px; } .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; @@ -3293,11 +3297,6 @@ body.oe_single_form .oe_single_form_container { overflow: hidden !important; } } -.ui-icon { - width: 18px; - height: 18px; -} - .tooltip { padding: 0; margin: 0; @@ -3307,8 +3306,6 @@ body.oe_single_form .oe_single_form_container { background: white; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); background-color: transparent; - /*We need a greater z-index in order for tooltip to go over bootstrap modal z-index*/ - z-index: 1500; } .tooltip .tooltip-inner { text-align: left !important; @@ -3345,6 +3342,12 @@ body.oe_single_form .oe_single_form_container { .tooltip .tooltip-inner .oe_tooltip_message { max-width: 310px; } + +.ui-icon { + width: 18px; + height: 18px; +} + .modal .modal-header button.close { border: none; background: none; @@ -3355,12 +3358,17 @@ body.oe_single_form .oe_single_form_container { .modal .modal-footer { text-align: left; } -.modal .oe_act_window.modal-body{ +.modal .oe_button { + margin: 0 4px 0 0; +} +.modal .oe_act_window.modal-body { padding: 0; } -.modal .oe_button{ - margin: 0 4px 0 0; + +.ui-datepicker { + z-index: 1500 !important; } + input[type="radio"], input[type="checkbox"] { margin-right: 4px; margin-left: 4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d83b09bc897..f1a92f44288 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -190,7 +190,7 @@ $sheet-padding: 16px td vertical-align: top .oe_title - width: 50% + width: 38% float: left .oe_title:after content: "." @@ -330,47 +330,48 @@ $sheet-padding: 16px @include box-shadow(none) &:hover background: #ED6F6A + .oe_stat_button + font-weight: normal + width: 132px !important + height: 40px + color: #666 + margin: 0px -1px -1px 0px + padding: 0 + border: 1px solid #dddddd + border-radius: 0 + box-shadow: none + background: white + > div + display: table-cell + vertical-align: middle + text-align: left + padding: 0 + line-height: 120% + .stat_button_icon + color: #7C7BAD + font-size: 24px + padding: 0px 3px + width: 37px + text-align: center + .oe_form_field_percent_pie + width: 42px + .oe_form_field_bar_chart + width: 42px + svg + width: 38px + height: 38px + display: inline + vertical-align: middle + .oe_stat_button:hover + background: #7c7bad + color: white + .fa + color: white .oe_button_box width: 400px - text-align: left - .oe_stat_button:hover - background: #7c7bad - color: white - .fa - color: white + text-align: right .oe_stat_button - font-weight: normal display: inline-table - width: 33% !important - height: 42px - margin: 0px -1px -1px 0px - padding: 0 - color: #666 - border: 1px solid #dddddd - border-radius: 0 - box-shadow: none - background: white - > div - display: table-cell - vertical-align: middle - text-align: left - padding: 0 - line-height: 120% - .stat_button_icon - color: #7C7BAD - font-size: 24px - padding: 0px 3px - width: 37px - text-align: center - .oe_form_field_percent_pie - width: 42px - .oe_form_field_bar_chart - width: 42px - svg - width: 38px - height: 38px - display: inline - vertical-align: middle .oe_avatar > img max-height: 90px @@ -639,7 +640,8 @@ $sheet-padding: 16px // }}} // Notifications {{{ .oe_notification - z-index: 1050 + z-index: 1500 + .oe_webclient_timezone_notification a color: white @@ -2220,11 +2222,14 @@ $sheet-padding: 16px padding: 3px 6px white-space: pre-line > td, > th - > button.btn_img + > button border: none background: transparent padding: 0 - @include box-shadow(none) + > button.btn_txt + border: 1px solid rgba(0,0,0,0.4) + background: #e3e3e3 + padding: 3px 12px > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child width: 17px &:after @@ -2736,6 +2741,9 @@ body.oe_single_form .oe_act_window.modal-body padding: 0 +.ui-datepicker + z-index: 1500 !important + input[type="radio"], input[type="checkbox"] margin-right: 4px margin-left: 4px diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index e1b654aa3f7..0aa46ebb104 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1460,7 +1460,7 @@ instance.web.embed = function (origin, dbname, login, key, action, options) { $('head').append($('<link>', { 'rel': 'stylesheet', 'type': 'text/css', - 'href': origin +'/web/webclient/css' + 'href': origin +'/web/css/web.assets_webclient' })); var currentScript = document.currentScript; if (!currentScript) { diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index a4bcd1922de..c64da7e5810 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -232,7 +232,7 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ var self = this; return this.session_reload().then(function(result) { var modules = instance._modules.join(','); - var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self)); + var deferred = self.load_qweb(modules); if(self.session_is_valid()) { return deferred.then(function() { return self.load_modules(); }); } @@ -318,7 +318,7 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ loaded = $.when( loaded, self.rpc('/web/webclient/csslist', {mods: to_load}).done(self.load_css.bind(self)), - self.rpc('/web/webclient/qweblist', {mods: to_load}).then(self.load_qweb.bind(self)), + self.load_qweb(to_load), self.rpc('/web/webclient/jslist', {mods: to_load}).done(function(files) { file_list = file_list.concat(files); }) @@ -375,14 +375,12 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ } return d; }, - load_qweb: function(files) { + load_qweb: function(mods) { var self = this; - _.each(files, function(file) { - self.qweb_mutex.exec(function() { - return self.rpc('/web/proxy/load', {path: file}).then(function(xml) { - if (!xml) { return; } - instance.web.qweb.add_template(_.str.trim(xml)); - }); + self.qweb_mutex.exec(function() { + return self.rpc('/web/proxy/load', {path: '/web/webclient/qweb?mods=' + mods}).then(function(xml) { + if (!xml) { return; } + instance.web.qweb.add_template(_.str.trim(xml)); }); }); return self.qweb_mutex.def; @@ -460,14 +458,11 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ .appendTo(document.body) .load(function () { try { - if (options.error) { - if (!this.contentDocument.body.childNodes[1]) { - options.error(this.contentDocument.body.childNodes); - } - else { - options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent)); - } - } + if (options.error) { + var body = this.contentDocument.body; + var node = body.childNodes[1] || body.childNodes[0]; + options.error(JSON.parse(node.textContent)); + } } finally { complete(); } diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 2de933f45e8..2f7ff81d089 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -32,7 +32,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ var self = this; var options = { buttons: [ - {text: _t("Close"), click: function () { self.close(); }}, + {text: _t("Close"), click: function () { self.$el.parents('.modal').modal('hide'); }}, {text: _t("Export To File"), click: function () { self.on_click_export_data(); }} ], close: function () { self.close();} diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 04bb1a61d99..832faa4ca62 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -29,8 +29,8 @@ my.Facet = B.Model.extend({ B.Model.prototype.initialize.apply(this, arguments); this.values = new my.FacetValues(values || []); - this.values.on('add remove change reset', function () { - this.trigger('change', this); + this.values.on('add remove change reset', function (_, options) { + this.trigger('change', this, options); }, this); }, get: function (key) { @@ -399,7 +399,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.setup_global_completion(); this.query = new my.SearchQuery() .on('add change reset remove', this.proxy('do_search')) - .on('add change reset remove', this.proxy('renderFacets')); + .on('change', this.proxy('renderChangedFacets')) + .on('add reset remove', this.proxy('renderFacets')); if (this.options.hidden) { this.$el.hide(); @@ -578,14 +579,20 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea .trigger('blur'); }, /** - * - * @param {openerp.web.search.SearchQuery | openerp.web.search.Facet} _1 - * @param {openerp.web.search.Facet} [_2] + * Call the renderFacets method with the correct arguments. + * This is due to the fact that change events are called with two arguments + * (model, options) while add, reset and remove events are called with + * (collection, model, options) as arguments + */ + renderChangedFacets: function (model, options) { + this.renderFacets(undefined, model, options); + }, + /** + * @param {openerp.web.search.SearchQuery | undefined} Undefined if event is change + * @param {openerp.web.search.Facet} * @param {Object} [options] */ - renderFacets: function (_1, _2, options) { - // _1: model if event=change, otherwise collection - // _2: undefined if event=change, otherwise model + renderFacets: function (collection, model, options) { var self = this; var started = []; var $e = this.$('div.oe_searchview_facets'); @@ -610,6 +617,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); $.when.apply(null, started).then(function () { + if (options && options.focus_input === false) return; var input_to_focus; // options.at: facet inserted at given index, focus next input // otherwise just focus last input @@ -618,7 +626,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } else { input_to_focus = self.input_subviews[(options.at + 1) * 2]; } - input_to_focus.$el.focus(); }); }, @@ -1602,8 +1609,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ return facetValue.get('label'); }, make_domain: function (name, operator, facetValue) { - if (operator === this.default_operator) { + switch(operator){ + case this.default_operator: return [[name, '=', facetValue.get('value')]]; + case 'child_of': + return [[name, 'child_of', facetValue.get('value')]]; } return this._super(name, operator, facetValue); }, diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js index 1f1c718ad5f..5e9483addc1 100644 --- a/addons/web/static/src/js/testing.js +++ b/addons/web/static/src/js/testing.js @@ -48,15 +48,6 @@ openerp.testing = {}; testing.dependencies = window['oe_all_dependencies'] || []; testing.current_module = null; - testing.templates = { }; - testing.add_template = function (name) { - var xhr = QWeb2.Engine.prototype.get_xhr(); - xhr.open('GET', name, false); - xhr.send(null); - (testing.templates[testing.current_module] = - testing.templates[testing.current_module] || []) - .push(xhr.responseXML); - }; /** * Function which does not do anything */ @@ -206,7 +197,7 @@ openerp.testing = {}; teardown: testing.noop }); - QUnit.module(testing.current_module + '.' + name, {_oe: options}); + QUnit.module(name, {_oe: options}); body(testing['case']); }; testing['case'] = function (name, options, callback) { @@ -244,18 +235,6 @@ openerp.testing = {}; expect(opts.asserts); } - if (opts.templates) { - for(var i=0; i<module_deps.length; ++i) { - var dep = module_deps[i]; - var templates = testing.templates[dep]; - if (_.isEmpty(templates)) { continue; } - - for (var j=0; j < templates.length; ++j) { - instance.web.qweb.add_template(templates[j]); - } - } - } - var $fixture = $('#qunit-fixture'); var mock, async = false; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 247fd2d2a1a..2c68a23dbf9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1940,7 +1940,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ init: function(field_manager, node) { node.attrs.type = node.attrs['data-button-type']; this.is_stat_button = /\boe_stat_button\b/.test(node.attrs['class']); - this.icon = node.attrs.icon && "<span class=\"fa " + node.attrs.icon + " fa-fw\"></span>"; + this.icon_class = node.attrs.icon && "stat_button_icon fa " + node.attrs.icon + " fa-fw"; this._super(field_manager, node); this.force_disabled = false; this.string = (this.node.attrs.string || '').replace(/_/g, ''); @@ -3356,13 +3356,16 @@ instance.web.form.CompletionFieldMixin = { instance.web.form.M2ODialog = instance.web.Dialog.extend({ template: "M2ODialog", init: function(parent) { + this.name = parent.string; this._super(parent, { - title: _.str.sprintf(_t("Add %s"), parent.string), + title: _.str.sprintf(_t("Create a %s"), parent.string), size: 'medium', }); }, start: function() { var self = this; + var text = _.str.sprintf(_t("You are creating a new %s, are you sure it does not exist yet?"), self.name); + this.$("p").text( text ); this.$buttons.html(QWeb.render("M2ODialog.buttons")); this.$("input").val(this.getParent().last_query); this.$buttons.find(".oe_form_m2o_qc_button").click(function(){ @@ -3486,7 +3489,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value_backup = {}; self.render_value(); self.focus(); - self.view.do_onchange(self); + self.trigger('changed_value'); }); }); }); @@ -3621,6 +3624,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc minLength: 0, delay: 250 }); + // set position for list of suggestions box + this.$input.autocomplete( "option", "position", { my : "left top", at: "left bottom" } ); this.$input.autocomplete("widget").openerpClass(); // used to correct a bug when selecting an element by pushing 'enter' in an editable list this.$input.keyup(function(e) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 24c5ba625b0..18a55656df2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,7 +40,7 @@ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 class="modal-title"><t t-raw="title"/></h3> </div> - <div class="modal-body"> + <div class="modal-body" style="overflow-y: auto;"> </div> </div> </div> @@ -800,12 +800,11 @@ </t> <button t-name="ListView.row.text_button" type="button" t-att-title="widget.string" t-att-disabled="disabled || undefined" - t-att-class="disabled ? 'oe_list_button_disabled btn' : 'btn'"> - <t t-esc="widget.string"/> -</button> + t-att-class="disabled ? 'oe_list_button_disabled btn_txt oe_link' : 'btn_txt oe_link'" + ><t t-esc="widget.string"/></button> <button t-name="ListView.row.button" type="button" t-att-title="widget.string" t-att-disabled="disabled || undefined" - t-att-class="disabled ? 'oe_list_button_disabled btn_img' : 'btn_img'" + t-att-class="disabled ? 'oe_list_button_disabled' : ''" ><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png" t-att-alt="widget.string"/></button> <t t-extend="ListView.row"> @@ -1409,7 +1408,7 @@ t-att-autofocus="widget.node.attrs.autofocus" t-att-accesskey="widget.node.attrs.accesskey"> <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/> - <div t-if="widget.is_stat_button and widget.icon" class="stat_button_icon"><t t-raw="widget.icon"/></div> + <div t-if="widget.is_stat_button and widget.icon_class" t-att-class="widget.icon_class"></div> <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span> <div t-if="widget.string and widget.is_stat_button"><t t-esc="widget.string"/></div> </button> @@ -1948,13 +1947,14 @@ </t> <t t-name="M2ODialog"> <div> + <p class="oe_grey"/> Name: <input class="oe_form_m2o_input_name" type="text"/> </div> </t> <t t-name="M2ODialog.buttons"> - <button class="oe_form_m2o_qc_button oe_button oe_highlight">Quick Add</button> - <button class="oe_form_m2o_sc_button oe_button">Add All Info...</button> - <button class="oe_form_m2o_cancel_button oe_button">Cancel</button> + <button class="oe_form_m2o_qc_button oe_button oe_highlight">Create</button> + <button class="oe_form_m2o_sc_button oe_button">Create and edit</button> or + <button class="oe_form_m2o_cancel_button oe_button oe_link"><span>Cancel</span></button> </t> <t t-name="FieldMonetary" t-extend="FieldChar"> <t t-jquery="t:first" t-operation="before"> @@ -1985,6 +1985,5 @@ <a href="javascript:void(0)"><t t-esc="text"/></a> </t> <t t-name="StatInfo"> - <strong><t t-esc="value"/></strong> - <t t-esc="text"/></t> + <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t> </templates> diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js index e73249549b8..ef2d608bc5d 100644 --- a/addons/web/static/test/list-editable.js +++ b/addons/web/static/test/list-editable.js @@ -361,8 +361,8 @@ openerp.testing.section('list.edition.onwrite', { strictEqual( $fix.find('tbody tr:eq(1)').css('color'), 'rgb(255, 0, 0)', 'shoud have color applied'); - strictEqual( - $fix.find('tbody tr:eq(2)').css('color'), 'rgb(0, 0, 0)', + notStrictEqual( + $fix.find('tbody tr:eq(2)').css('color'), 'rgb(255, 0, 0)', 'should have default color applied'); }); }); diff --git a/addons/web/tests/__init__.py b/addons/web/tests/__init__.py index 8c20aed1ce5..beb9e90eb76 100644 --- a/addons/web/tests/__init__.py +++ b/addons/web/tests/__init__.py @@ -2,4 +2,3 @@ import test_js import test_menu import test_serving_base -import test_ui diff --git a/addons/web/tests/qunitsuite/README.rst b/addons/web/tests/qunitsuite/README.rst deleted file mode 100644 index f1cfb96a508..00000000000 --- a/addons/web/tests/qunitsuite/README.rst +++ /dev/null @@ -1,116 +0,0 @@ -QUnitSuite is a ``unittest.TestSuite`` able to run QUnit_ test suites -within the normal unittest process, through PhantomJS_. - -QUnitSuite is built upon `Ben Alman`_'s work of for the interfacing -between PhantomJS_ and the host/reporting code: the shims and the -PhantomJS_ configuration files are those of grunt_'s ``qunit`` task. - -Why ---- - -You're a Python shop or developer, you have tools and tests built -around unittest (or compatible with unittests) and your testing -pipeline is predicated upon that, you're doing web development of some -sort these days (as so many are) and you'd like to do some testing of -your web stuff. - -But you don't really want to redo your whole testing stack just for -that. - -QUnitSuite simply grafts QUnit_-based tests, run in PhantomJS_, in -your existing ``unittest``-based architecture. - -What ----- - -QUnitSuite currently provides a single object as part of its API: -``qunitsuite.QUnitSuite(testfile[, timeout])``. - -This produces a ``unittest.TestSuite`` suitable for all the usual -stuff (running it, and giving it to an other test suite which will run -it, that is). - -``testfile`` is the HTML file bootstrapping your qunit tests, as would -usually be accessed via a browser. It can be either a local -(``file:``) url, or an HTTP one. As long as a regular browser can open -and execute it, PhantomJS_ will manage. - -``timeout`` is a check passed to the PhantomJS_ runner: if the runner -produces no information for longer than ``timeout`` milliseconds, the -run will be cancelled and a test error will be generated. This -situation usually means either your ``testfile`` is not a qunit test -file, qunit is not running or qunit's runner was stopped (for an async -test) and never restarted. - -The default value is very conservative, most tests should run -correctly with lower timeouts (especially if all tests are -synchronous). - -How ---- - -``unittest``'s autodiscovery protocol does not directly work with test -suites (it looks for test cases). If you want autodiscovery to work -correctly, you will have to use the ``load_tests`` protocol:: - - # in a testing module - def load_tests(loader, tests, pattern): - tests.addTest(QUnitSuite(qunit_test_path.html)) - return tests - -outside of that specific case, you can use a ``QUnitSuite`` as a -standard ``TestSuite`` instance, running it, adding it to an other -suite or passing it to a ``TestRunner`` - -Complaints and Grievances -------------------------- - -Speed -~~~~~ - -Starting up a phantomjs instance and running a suite turns out to have -a rather high overhead, on the order of a second on this machine -(2.4GHz, 8GB RAM and an SSD). - -As each ``QUnitSuite`` currently creates its own phantomjs instance, -it's probably a good idea to create bigger suites (put many modules & -tests in the same QUnit html file, which doesn't preclude splitting -them across multiple js files). - -Hacks -~~~~~ - -QUnitSuite contains a pretty big hack which may or may not cause -problem depending on your exact setup: in case of case failure or -error, ``unittest.TestResult`` formats the error traceback provided -alongside the test object. This goes through Python's -traceback-formatting code and there are no hooks there. - -One could expect to use a custom ``TestResult``, but for test suites -the ``TestResult`` instance must be provided by the caller, so there -is no direct hook onto it. - -This leaves three options: - -* Create a custom ``TestResult`` class and require that it be the one - provided to the test suite. This requires altered work flows, - customization of the test runner and (as far as I know) isn't - available through Python 2.7's autodiscovery. It's the cleanest - option but completely fails on practicality. - -* Create a custom ``TestResult`` which directly alters the original - result's ``errors`` and ``failures`` attributes as they're part of - the testrunner API. This would work but may put custom results in a - strange state and break e.g. unittest2's ``@failfast``. - -* Lastly, monkeypatch the undocumented and implementation detail - ``_exc_info_to_string`` on the provided ``result``. This is the - route taken, at least for now. - -.. _QUnit: http://qunitjs.com/ - -.. _PhantomJS: http://phantomjs.org/ - -.. _Ben Alman: http://benalman.com/ - -.. _grunt: http://gruntjs.com/ diff --git a/addons/web/tests/qunitsuite/__init__.py b/addons/web/tests/qunitsuite/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 --- a/addons/web/tests/qunitsuite/__init__.py +++ /dev/null diff --git a/addons/web/tests/qunitsuite/grunt/bootstrap.js b/addons/web/tests/qunitsuite/grunt/bootstrap.js deleted file mode 100644 index 3d5e38912ca..00000000000 --- a/addons/web/tests/qunitsuite/grunt/bootstrap.js +++ /dev/null @@ -1,95 +0,0 @@ -/* - * grunt - * http://gruntjs.com/ - * - * Copyright (c) 2012 "Cowboy" Ben Alman - * Licensed under the MIT license. - * http://benalman.com/about/license/ - */ - -/*global phantom:true*/ - -'use strict'; - -var fs = require('fs'); - -// The page .html file to load. -var url = phantom.args[0]; -// Extra, optionally overridable stuff. -var options = JSON.parse(phantom.args[1] || {}); - -// Default options. -if (!options.timeout) { options.timeout = 5000; } - -// Keep track of the last time a client message was sent. -var last = new Date(); - -// Messages are sent to the parent by appending them to the tempfile. -var sendMessage = function(arg) { - var args = Array.isArray(arg) ? arg : [].slice.call(arguments); - last = new Date(); - console.log(JSON.stringify(args)); -}; - -// This allows grunt to abort if the PhantomJS version isn't adequate. -sendMessage('private', 'version', phantom.version); - -// Abort if the page doesn't send any messages for a while. -setInterval(function() { - if (new Date() - last > options.timeout) { - sendMessage('fail.timeout'); - phantom.exit(); - } -}, 100); - -// Create a new page. -var page = require('webpage').create(); - -// The client page must send its messages via alert(jsonstring). -page.onAlert = function(args) { - sendMessage(JSON.parse(args)); -}; - -// Keep track if the client-side helper script already has been injected. -var injected; -page.onUrlChanged = function(newUrl) { - injected = false; - sendMessage('onUrlChanged', newUrl); -}; - -// Relay console logging messages. -page.onConsoleMessage = function(message) { - sendMessage('console', message); -}; - -// For debugging. -page.onResourceRequested = function(request) { - sendMessage('onResourceRequested', request.url); -}; - -page.onResourceReceived = function(request) { - if (request.stage === 'end') { - sendMessage('onResourceReceived', request.url); - } -}; - -// Run when the page has finished loading. -page.onLoadFinished = function(status) { - // The window has loaded. - sendMessage('onLoadFinished', status); - if (status === 'success') { - if (options.inject && !injected) { - // Inject client-side helper script, but only if it has not yet been - // injected. - sendMessage('inject', options.inject); - page.injectJs(options.inject); - } - } else { - // File loading failure. - sendMessage('fail.load', url); - phantom.exit(); - } -}; - -// Actually load url. -page.open(url); diff --git a/addons/web/tests/qunitsuite/grunt/license b/addons/web/tests/qunitsuite/grunt/license deleted file mode 100644 index 90c336c39d3..00000000000 --- a/addons/web/tests/qunitsuite/grunt/license +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2012 "Cowboy" Ben Alman - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/addons/web/tests/qunitsuite/grunt/phantomjs.json b/addons/web/tests/qunitsuite/grunt/phantomjs.json deleted file mode 100644 index 9e26dfeeb6e..00000000000 --- a/addons/web/tests/qunitsuite/grunt/phantomjs.json +++ /dev/null @@ -1 +0,0 @@ -{}
\ No newline at end of file diff --git a/addons/web/tests/qunitsuite/grunt/qunit-phantomjs-bridge.js b/addons/web/tests/qunitsuite/grunt/qunit-phantomjs-bridge.js deleted file mode 100644 index 032fe8a3aa0..00000000000 --- a/addons/web/tests/qunitsuite/grunt/qunit-phantomjs-bridge.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * grunt - * http://gruntjs.com/ - * - * Copyright (c) 2012 "Cowboy" Ben Alman - * Licensed under the MIT license. - * http://benalman.com/about/license/ - */ - -/*global QUnit:true, alert:true*/ - -'use strict'; - -// Don't re-order tests. -QUnit.config.reorder = false; -// Run tests serially, not in parallel. -QUnit.config.autorun = false; - -// Send messages to the parent PhantomJS process via alert! Good times!! -function sendMessage() { - var args = [].slice.call(arguments); - alert(JSON.stringify(args)); -} - -// These methods connect QUnit to PhantomJS. -QUnit.log(function(obj) { - // What is this I don’t even - if (obj.message === '[object Object], undefined:undefined') { return; } - // Parse some stuff before sending it. - var actual = QUnit.jsDump.parse(obj.actual); - var expected = QUnit.jsDump.parse(obj.expected); - // Send it. - sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source); -}); - -QUnit.testStart(function(obj) { - sendMessage('qunit.testStart', obj.name); -}); - -QUnit.testDone(function(obj) { - sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total); -}); - -QUnit.moduleStart(function(obj) { - sendMessage('qunit.moduleStart', obj.name); -}); - -QUnit.moduleDone(function(obj) { - sendMessage('qunit.moduleDone', obj.name, obj.failed, obj.passed, obj.total); -}); - -QUnit.begin(function() { - sendMessage('qunit.begin'); -}); - -QUnit.done(function(obj) { - sendMessage('qunit.done', obj.failed, obj.passed, obj.total, obj.runtime); -}); - -// PhantomJS (up to and including 1.7) uses a version of webkit so old -// it does not have Function.prototype.bind: -// http://code.google.com/p/phantomjs/issues/detail?id=522 - -// Use moz polyfill: -// https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Function/bind#Compatibility -if (!Function.prototype.bind) { - Function.prototype.bind = function (oThis) { - if (typeof this !== "function") { - // closest thing possible to the ECMAScript 5 internal IsCallable function - throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); - } - - var aArgs = Array.prototype.slice.call(arguments, 1), - fToBind = this, - fNOP = function () {}, - fBound = function () { - return fToBind.apply(this instanceof fNOP && oThis - ? this - : oThis, - aArgs.concat(Array.prototype.slice.call(arguments))); - }; - - fNOP.prototype = this.prototype; - fBound.prototype = new fNOP(); - - return fBound; - }; -} diff --git a/addons/web/tests/qunitsuite/suite.py b/addons/web/tests/qunitsuite/suite.py deleted file mode 100644 index 54d2e18e36e..00000000000 --- a/addons/web/tests/qunitsuite/suite.py +++ /dev/null @@ -1,136 +0,0 @@ -import json -import subprocess -import unittest -import os -import time - -ROOT = os.path.join(os.path.dirname(__file__), 'grunt') - -__all__ = ['QUnitSuite'] - -def _exc_info_to_string(err, test): - return err - -class QUnitTest(unittest.TestCase): - def __init__(self, module, name): - self.module = module - self.name = name - self.failed = False - def shortDescription(self): - return None - def __repr__(self): - return '<QUnitTest %s:%s>' % (self.module, self.name) - def __str__(self): - return '%s: %s' % (self.module, self.name) - -class QUnitSuite(unittest.TestSuite): - def __init__(self, qunitfile, timeout=5000): - super(QUnitSuite, self).__init__() - self.testfile = qunitfile - self.timeout = timeout - self._module = None - self._test = None - - def run(self, result): - try: - subprocess.call(['phantomjs', '-v'], - stdout=open(os.devnull, 'w'), - stderr=subprocess.STDOUT) - except OSError: - test = QUnitTest('phantomjs', 'javascript tests') - result.startTest(test) - result.startTest(test) - result.addSkip(test , "phantomjs command not found") - result.stopTest(test) - return - - result._exc_info_to_string = _exc_info_to_string - try: - self._run(result) - finally: - del result._exc_info_to_string - - def _run(self, result): - phantom = subprocess.Popen([ - 'phantomjs', - '--config=%s' % os.path.join(ROOT, 'phantomjs.json'), - os.path.join(ROOT, 'bootstrap.js'), self.testfile, - json.dumps({ - 'timeout': self.timeout, - 'inject': os.path.join(ROOT, 'qunit-phantomjs-bridge.js') - }) - ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - - try: - while True: - line = phantom.stdout.readline() - if line: - if self.process(line, result): - break - else: - time.sleep(0.1) - finally: - # If the phantomjs process hasn't quit, kill it - if phantom.poll() is None: - phantom.terminate() - - def process(self, line, result): - try: - args = json.loads(line) - except ValueError: # phantomjs stderr - if 'CoreText' not in line: - print line - return False - event_name = args[0] - - if event_name == 'qunit.done': - return True - elif event_name == 'fail.load': - self.add_error(result, "PhantomJS unable to load %s" % args[1]) - return True - elif event_name == 'fail.timeout': - self.add_error(result, "PhantomJS timed out, possibly due to a" - " missing QUnit start() call") - return True - - elif event_name == 'qunit.moduleStart': - self._module = args[1].encode('utf-8') if args[1] else '' - elif event_name == 'qunit.moduleStop': - self._test = None - self._module = None - elif event_name == 'qunit.testStart': - self._test = QUnitTest(self._module, args[1].encode('utf-8')) - result.startTest(self._test) - elif event_name == 'qunit.testDone': - if not self._test.failed: - result.addSuccess(self._test) - result.stopTest(self._test) - self._test = None - elif event_name == 'qunit.log': - if args[1]: - return False - - self._test.failed = True - result.addFailure( - self._test, self.failure_to_str(*args[2:])) - elif event_name == 'console': - print args[1] - - return False - - def add_error(self, result, s): - test = QUnitTest('phantomjs', 'startup') - result.startTest(test) - result.addError(test, s) - result.stopTest(test) - - def failure_to_str(self, actual, expected, message, source): - if message or actual == expected: - formatted = str(message or '') - else: - formatted = "%s != %s" % (actual, expected) - - if source: - formatted += '\n\n' + source - - return formatted diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py index 0bab1de96a5..496d7e283bc 100644 --- a/addons/web/tests/test_js.py +++ b/addons/web/tests/test_js.py @@ -1,24 +1,6 @@ -import urllib -import urlparse -from openerp import sql_db, tools -from qunitsuite.suite import QUnitSuite +import openerp -class WebSuite(QUnitSuite): - def __init__(self, module): - url = urlparse.urlunsplit([ - 'http', - 'localhost:{port}'.format(port=tools.config['xmlrpc_port']), - '/web/tests', - urllib.urlencode({ - 'mod': module, - 'source': tools.config['db_name'], - 'supadmin': tools.config['admin_passwd'], - 'password': 'admin', - }), - '' - ]) - super(WebSuite, self).__init__(url, 50000) +class WebSuite(openerp.tests.HttpCase): + def test_01_js(self): + self.phantom_js('/web/tests?mod=web',"","", login='admin') -def load_tests(loader, standard_tests, _): - standard_tests.addTest(WebSuite('web')) - return standard_tests diff --git a/addons/web/tests/test_menu.py b/addons/web/tests/test_menu.py index fb9337a589b..0978a7093ad 100644 --- a/addons/web/tests/test_menu.py +++ b/addons/web/tests/test_menu.py @@ -28,9 +28,7 @@ class LoadTest(common.MockRequestCase): self.MockMenus = model('ir.ui.menu') # Mock the absence of custom menu - model('res.users').read.return_value = [{ - 'menu_id': False - }] + model('res.users').read.return_value = [] def tearDown(self): del self.MockMenus diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 46bae5f83ca..2c3a16ac13f 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -3,6 +3,101 @@ --> <openerp> <data> + <template id="web.assets_common"> + <script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script> + <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script> + <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script> + <script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script> + <script type="text/javascript" src="/web/static/lib/spinjs/spin.js"></script> + + <!-- jQuery stuff --> + <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.blockUI/jquery.blockUI.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.placeholder/jquery.placeholder.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.timeago/jquery.timeago.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.form/jquery.form.js"></script> + + <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script> + + <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/> + </template> + + <template id="web.assets_backend"> + <t t-call="web.assets_common"/> + <!-- Datejs --> + <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script> + <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script> + <script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script> + <script type="text/javascript" src="/web/static/lib/datejs/extras.js"></script> + + <!-- jQuery addons --> + <script type="text/javascript" src="/web/static/lib/jquery.validate/jquery.validate.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.autosize/jquery.autosize.js"></script> + <script type="text/javascript" src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js"></script> + + <link rel="stylesheet" href="/web/static/lib/cleditor/jquery.cleditor.css"/> + <script type="text/javascript" src="/web/static/lib/cleditor/jquery.cleditor.js"></script> + + <link rel="stylesheet" href="/web/static/lib/jquery.textext/jquery.textext.css"/> + <script type="text/javascript" src="/web/static/lib/jquery.textext/jquery.textext.js"></script> + + <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/> + <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script> + + + <!-- jQuery ui --> + <link rel="stylesheet" href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css"/> + <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script> + + <link rel="stylesheet" href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css"/> + <script type="text/javascript" src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js"></script> + + <link rel="stylesheet" href="/web/static/lib/jquery.ui.notify/css/ui.notify.css"/> + <script type="text/javascript" src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js"></script> + + <!-- Bootstrap must be loaded after jquery.ui until jquery.ui is removed --> + <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css"/> + <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script> + + <!-- Backbone --> + <script type="text/javascript" src="/web/static/lib/backbone/backbone.js"></script> + + <!-- Internals --> + <link rel="stylesheet" href="/web/static/src/css/base.css"/> + <link rel="stylesheet" href="/web/static/src/css/data_export.css"/> + <link rel="stylesheet" href="/base/static/src/css/modules.css"/> + + <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script> + <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script> + <script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script> + <script type="text/javascript" src="/web/static/src/js/boot.js"></script> + <script type="text/javascript" src="/web/static/src/js/testing.js"></script> + <script type="text/javascript" src="/web/static/src/js/pyeval.js"></script> + <script type="text/javascript" src="/web/static/src/js/core.js"></script> + <script type="text/javascript" src="/web/static/src/js/formats.js"></script> + <script type="text/javascript" src="/web/static/src/js/chrome.js"></script> + <script type="text/javascript" src="/web/static/src/js/views.js"></script> + <script type="text/javascript" src="/web/static/src/js/data.js"></script> + <script type="text/javascript" src="/web/static/src/js/data_export.js"></script> + <script type="text/javascript" src="/web/static/src/js/search.js"></script> + <script type="text/javascript" src="/web/static/src/js/view_list.js"></script> + <script type="text/javascript" src="/web/static/src/js/view_form.js"></script> + <script type="text/javascript" src="/web/static/src/js/view_list_editable.js"></script> + <script type="text/javascript" src="/web/static/src/js/view_tree.js"></script> + <script type="text/javascript" src="/base/static/src/js/apps.js"></script> + + </template> + + <template id="web.assets_webclient_manifest"> + <!-- This bundle can be used for module manifest asset declaration backward compatibility --> + <t t-foreach="manifest_list('css')" t-as="css_file"> + <link rel="stylesheet" t-att-href="css_file"/> + </t> + <t t-foreach="manifest_list('js')" t-as="js_file"> + <script type="text/javascript" t-att-src="js_file"></script> + </t> + </template> <template id="web.layout" name="Web layout"><!DOCTYPE html> <html style="height: 100%"> @@ -23,12 +118,7 @@ <template id="web.webclient_bootstrap" name="Webclient Bootstrap"> <t t-call="web.layout"> <t t-set="head"> - <t t-foreach="css" t-as="css_file"> - <link rel="stylesheet" t-att-href="css_file"/> - </t> - <t t-foreach="js" t-as="js_file"> - <script type="text/javascript" t-att-src="js_file"></script> - </t> + <t t-call-assets="web.assets_backend"/> <script type="text/javascript"> $(function() { var s = new openerp.init(<t t-raw="modules"/>); @@ -78,10 +168,10 @@ </script> <div class="form-group field-db" t-if="databases and len(databases) > 1"> <label for="db" class="control-label">Database</label> - <select name="db" id="db" class="form-control" required="required" t-att-autofocus="'autofocus' if current_db not in databases else None" onchange="dbchanged(this.value)"> + <select name="db" id="db" class="form-control" required="required" t-att-autofocus="'autofocus' if request.db not in databases else None" onchange="dbchanged(this.value)"> <option></option> <t t-foreach="databases" t-as="db"> - <option t-att-selected="'selected' if db == current_db else None"> + <option t-att-selected="'selected' if db == request.db else None"> <t t-esc="db"/> </option> </t> @@ -121,5 +211,55 @@ </t> </template> + <template id="web.qunit_suite"> + <!DOCTYPE html> + <html style="height: 100%"> + <head> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title>OpenERP Web Tests</title> + + <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> + <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"/> + <script src="/web/static/lib/qunit/qunit.js"></script> + + <t t-call="web.assets_backend"/> + + <script type="text/javascript" id="qunit_config"> + QUnit.config.testTimeout = 5 * 60 * 1000; + QUnit.moduleDone(function(result) { + console.log(result.name + " (" + result.passed + "/" + result.total + " passed tests)"); + }); + QUnit.done(function(result) { + if (result.failed === 0) { + console.log('ok'); + } + }); + openerp.web.qweb.add_template("/web/webclient/qweb"); + </script> + + <script type="text/javascript" src="/web/static/test/testing.js"></script> + <script type="text/javascript" src="/web/static/test/framework.js"></script> + <script type="text/javascript" src="/web/static/test/registry.js"></script> + <script type="text/javascript" src="/web/static/test/form.js"></script> + <script type="text/javascript" src="/web/static/test/data.js"></script> + <script type="text/javascript" src="/web/static/test/list-utils.js"></script> + <script type="text/javascript" src="/web/static/test/formats.js"></script> + <script type="text/javascript" src="/web/static/test/rpc-misordered.js"></script> + <script type="text/javascript" src="/web/static/test/evals.js"></script> + <script type="text/javascript" src="/web/static/test/search.js"></script> + <script type="text/javascript" src="/web/static/test/list.js"></script> + <script type="text/javascript" src="/web/static/test/list-editable.js"></script> + <script type="text/javascript" src="/web/static/test/mutex.js"></script> + </head> + + <body id="oe" class="openerp"> + <div id="qunit"></div> + <div id="qunit-fixture"></div> + </body> + </html> + + </template> + </data> </openerp> diff --git a/addons/web_api/__openerp__.py b/addons/web_api/__openerp__.py index a294719aaa6..4eb15fcefa9 100644 --- a/addons/web_api/__openerp__.py +++ b/addons/web_api/__openerp__.py @@ -10,8 +10,4 @@ Openerp Web API. 'depends': ['web'], 'installable': True, 'auto_install': False, - 'js' : [ - ], - 'css' : [ - ], } diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py index 0c27b7359c3..a249df073d4 100644 --- a/addons/web_calendar/__openerp__.py +++ b/addons/web_calendar/__openerp__.py @@ -9,14 +9,8 @@ OpenERP Web Calendar view. 'author': 'OpenERP SA, Valentino Lab (Kalysto)', 'version': '2.0', 'depends': ['web'], - 'data' : [], - 'js': [ - 'static/lib/fullcalendar/js/fullcalendar.js', - 'static/src/js/*.js' - ], - 'css': [ - 'static/lib/fullcalendar/css/*.css', - 'static/src/css/*.css' + 'data' : [ + 'views/web_calendar.xml', ], 'qweb': [ 'static/src/xml/*.xml', diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po index 2e978ee4972..74bd077cb63 100644 --- a/addons/web_calendar/i18n/ar.po +++ b/addons/web_calendar/i18n/ar.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po index 5e6747c85a4..c7ea00fcf40 100644 --- a/addons/web_calendar/i18n/bg.po +++ b/addons/web_calendar/i18n/bg.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po index 29913a920fe..2903115c553 100644 --- a/addons/web_calendar/i18n/bn.po +++ b/addons/web_calendar/i18n/bn.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po index ebb323f36d6..bd55cba6068 100644 --- a/addons/web_calendar/i18n/bs.po +++ b/addons/web_calendar/i18n/bs.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po index ec436446860..00493aef5b2 100644 --- a/addons/web_calendar/i18n/ca.po +++ b/addons/web_calendar/i18n/ca.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po index 9776a0b223d..6ed49371c3d 100644 --- a/addons/web_calendar/i18n/cs.po +++ b/addons/web_calendar/i18n/cs.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po index 0ae63721d7a..c9571f57155 100644 --- a/addons/web_calendar/i18n/da.po +++ b/addons/web_calendar/i18n/da.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po index 3cf855803ef..16999fe1507 100644 --- a/addons/web_calendar/i18n/de.po +++ b/addons/web_calendar/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po index 59df12ce29a..ca78aa27061 100644 --- a/addons/web_calendar/i18n/en_AU.po +++ b/addons/web_calendar/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po index 732610bec7a..6876296c838 100644 --- a/addons/web_calendar/i18n/en_GB.po +++ b/addons/web_calendar/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po index 1776b2e9f9d..dc1e5eca3ac 100644 --- a/addons/web_calendar/i18n/es.po +++ b/addons/web_calendar/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po index 7019f666546..09dc3fa9f80 100644 --- a/addons/web_calendar/i18n/es_CL.po +++ b/addons/web_calendar/i18n/es_CL.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po index c876b36109a..de70fa5bd0f 100644 --- a/addons/web_calendar/i18n/es_CR.po +++ b/addons/web_calendar/i18n/es_CR.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "Language: es\n" diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po index bdfa43134b9..c12dcaa8b67 100644 --- a/addons/web_calendar/i18n/es_DO.po +++ b/addons/web_calendar/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po index 597f2694253..153818ad4bb 100644 --- a/addons/web_calendar/i18n/es_EC.po +++ b/addons/web_calendar/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po index e7541d459ca..075f85deea1 100644 --- a/addons/web_calendar/i18n/es_MX.po +++ b/addons/web_calendar/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po index df8c641130e..d1fffa8c8fd 100644 --- a/addons/web_calendar/i18n/es_PE.po +++ b/addons/web_calendar/i18n/es_PE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po index 61827573b8f..384ff3cc903 100644 --- a/addons/web_calendar/i18n/et.po +++ b/addons/web_calendar/i18n/et.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po index fa7b81a2256..f3acb44695e 100644 --- a/addons/web_calendar/i18n/eu.po +++ b/addons/web_calendar/i18n/eu.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po index af09c4f13e4..269edb4a31a 100644 --- a/addons/web_calendar/i18n/fa.po +++ b/addons/web_calendar/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po index 87a0a5f13c4..66017854789 100644 --- a/addons/web_calendar/i18n/fi.po +++ b/addons/web_calendar/i18n/fi.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po index 18f70d342f9..fc1e1ddbd65 100644 --- a/addons/web_calendar/i18n/fr.po +++ b/addons/web_calendar/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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po index c42a33bebab..3aa4900e6df 100644 --- a/addons/web_calendar/i18n/fr_CA.po +++ b/addons/web_calendar/i18n/fr_CA.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po index facbc6a7315..e4aed3dd84a 100644 --- a/addons/web_calendar/i18n/gl.po +++ b/addons/web_calendar/i18n/gl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po index c353334d285..d300e23beef 100644 --- a/addons/web_calendar/i18n/gu.po +++ b/addons/web_calendar/i18n/gu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po index d12665d453a..3c64ac1f6f7 100644 --- a/addons/web_calendar/i18n/hr.po +++ b/addons/web_calendar/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po index 84b0338422b..632867ceb70 100644 --- a/addons/web_calendar/i18n/hu.po +++ b/addons/web_calendar/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po index a5f35904015..af264d1b44d 100644 --- a/addons/web_calendar/i18n/id.po +++ b/addons/web_calendar/i18n/id.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po index ac96de106d5..e6231254189 100644 --- a/addons/web_calendar/i18n/it.po +++ b/addons/web_calendar/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po index cb007a182ee..154eb582bb6 100644 --- a/addons/web_calendar/i18n/ja.po +++ b/addons/web_calendar/i18n/ja.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po index a637ec17f4a..464f5b0926e 100644 --- a/addons/web_calendar/i18n/ka.po +++ b/addons/web_calendar/i18n/ka.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po index 206a3527d4e..d68668ab519 100644 --- a/addons/web_calendar/i18n/ko.po +++ b/addons/web_calendar/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po index d9675ffd835..edec20d6060 100644 --- a/addons/web_calendar/i18n/lt.po +++ b/addons/web_calendar/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po index 1078393e4db..8de8c856b38 100644 --- a/addons/web_calendar/i18n/mk.po +++ b/addons/web_calendar/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po index a770c395d62..c9272b2906f 100644 --- a/addons/web_calendar/i18n/mn.po +++ b/addons/web_calendar/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po index 2cdab0ab218..df07f4f9e65 100644 --- a/addons/web_calendar/i18n/nb.po +++ b/addons/web_calendar/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po index 564d99e9884..ede80721214 100644 --- a/addons/web_calendar/i18n/nl.po +++ b/addons/web_calendar/i18n/nl.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po index f928ab1108c..e5ca866c73c 100644 --- a/addons/web_calendar/i18n/nl_BE.po +++ b/addons/web_calendar/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po index 9c79b404934..2a749c1a323 100644 --- a/addons/web_calendar/i18n/pl.po +++ b/addons/web_calendar/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po index 650ef789504..c019e41d290 100644 --- a/addons/web_calendar/i18n/pt.po +++ b/addons/web_calendar/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po index 625281a6c01..a28af392991 100644 --- a/addons/web_calendar/i18n/pt_BR.po +++ b/addons/web_calendar/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po index 983132fd7e3..d1e58cd4fef 100644 --- a/addons/web_calendar/i18n/ro.po +++ b/addons/web_calendar/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po index 16d0f16314f..d4a52e2b2c3 100644 --- a/addons/web_calendar/i18n/ru.po +++ b/addons/web_calendar/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po index c2ea5887d33..d2b4005bcfb 100644 --- a/addons/web_calendar/i18n/sk.po +++ b/addons/web_calendar/i18n/sk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po index 8b43cb588db..7ee5684832f 100644 --- a/addons/web_calendar/i18n/sl.po +++ b/addons/web_calendar/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po index ab7d1e3f164..cf03469fefc 100644 --- a/addons/web_calendar/i18n/sq.po +++ b/addons/web_calendar/i18n/sq.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: 2014-04-18 06:40+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po index d5f999b13dd..89ec4e29747 100644 --- a/addons/web_calendar/i18n/sr@latin.po +++ b/addons/web_calendar/i18n/sr@latin.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po index c95a890b055..d3bbdff2c38 100644 --- a/addons/web_calendar/i18n/sv.po +++ b/addons/web_calendar/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po index 4172318454c..e04d7a26b0c 100644 --- a/addons/web_calendar/i18n/th.po +++ b/addons/web_calendar/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po index 4a4146a37cb..c2643231393 100644 --- a/addons/web_calendar/i18n/tr.po +++ b/addons/web_calendar/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po index a8a87d16b59..f39ff12a704 100644 --- a/addons/web_calendar/i18n/uk.po +++ b/addons/web_calendar/i18n/uk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po index e4f3a1cc8b2..099753d08e7 100644 --- a/addons/web_calendar/i18n/zh_CN.po +++ b/addons/web_calendar/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po index 16fcc8d4992..f305a87f08f 100644 --- a/addons/web_calendar/i18n/zh_TW.po +++ b/addons/web_calendar/i18n/zh_TW.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_calendar diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 380df1f4d4c..4bbe3bcb516 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -11,7 +11,6 @@ _.str.toBoolElse = function (str, elseValues, trueValues, falseValues) { }; openerp.web_calendar = function(instance) { - var _t = instance.web._t, _lt = instance.web._lt, QWeb = instance.web.qweb; @@ -197,6 +196,13 @@ openerp.web_calendar = function(instance) { } else { this.avatar_title = attrs.avatar_title; } + + if (isNullOrUndef(attrs.avatar_filter)) { + this.avatar_filter = this.avatar_model; + } else { + this.avatar_filter = attrs.avatar_filter; + } + this.color_field = attrs.color; if (this.color_field && this.selected_filters.length === 0) { @@ -578,7 +584,7 @@ openerp.web_calendar = function(instance) { if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) { tempColor = (self.all_filters[the_attendee_people] !== undefined) ? self.all_filters[the_attendee_people].color - : self.all_filters[-1].color; + : (self.all_filters[-1] ? self.all_filters[-1].color : 1); the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>'; }//else don't add myself } @@ -701,7 +707,6 @@ openerp.web_calendar = function(instance) { } if (!self.useContacts) { // If we use all peoples displayed in the current month as filter in sidebars - var filter_value; var filter_item; @@ -714,7 +719,7 @@ openerp.web_calendar = function(instance) { value: filter_value, label: e[self.color_field][1], color: self.get_color(filter_value), - avatar_model: self.avatar_model, + avatar_model: (_.str.toBoolElse(self.avatar_filter, true) ? self.avatar_filter : false ), is_checked: true }; self.all_filters[e[self.color_field][0]] = filter_item; @@ -735,7 +740,7 @@ openerp.web_calendar = function(instance) { return null; }); } - return self.perform_necessary_name_gets(events).then(callback); + } else { //WE USE CONTACT if (self.attendee_people !== undefined) { @@ -752,25 +757,27 @@ openerp.web_calendar = function(instance) { } } - var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; }); - all_attendees = _.chain(all_attendees).flatten().uniq().value(); + + } - self.all_attendees = {}; - if (self.avatar_title !== null) { - new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) { - _.each(result, function(item) { - self.all_attendees[item.id] = item.name; - }); - }).done(function() { - return self.perform_necessary_name_gets(events).then(callback); - }); - } - else { - _.each(all_attendees,function(item){ - self.all_attendees[item] = ''; + var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; }); + all_attendees = _.chain(all_attendees).flatten().uniq().value(); + + self.all_attendees = {}; + if (self.avatar_title !== null) { + new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) { + _.each(result, function(item) { + self.all_attendees[item.id] = item.name; }); + }).done(function() { return self.perform_necessary_name_gets(events).then(callback); - } + }); + } + else { + _.each(all_attendees,function(item){ + self.all_attendees[item] = ''; + }); + return self.perform_necessary_name_gets(events).then(callback); } }); }, diff --git a/addons/web_calendar/views/web_calendar.xml b/addons/web_calendar/views/web_calendar.xml new file mode 100644 index 00000000000..8ae9bf1fe39 --- /dev/null +++ b/addons/web_calendar/views/web_calendar.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_calendar assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_calendar/static/src/css/web_fullcalendar.css"/> + <link rel="stylesheet" href="/web_calendar/static/lib/fullcalendar/css/fullcalendar.css"/> + + <script type="text/javascript" src="/web_calendar/static/lib/fullcalendar/js/fullcalendar.js"></script> + <script type="text/javascript" src="/web_calendar/static/src/js/web_calendar.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index 71156411fe3..f7a20b40935 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -8,15 +8,8 @@ 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', + 'data' : [ + 'views/web_diagram.xml', ], 'qweb': [ 'static/src/xml/*.xml', diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po index 329d0d20d4a..4cd020b8012 100644 --- a/addons/web_diagram/i18n/ar.po +++ b/addons/web_diagram/i18n/ar.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po index a84dee9671e..d60b63c92c5 100644 --- a/addons/web_diagram/i18n/bg.po +++ b/addons/web_diagram/i18n/bg.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po index fc2d5d61b4f..11421ca2732 100644 --- a/addons/web_diagram/i18n/bn.po +++ b/addons/web_diagram/i18n/bn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po index 2ece4a288de..6b60aff57bb 100644 --- a/addons/web_diagram/i18n/bs.po +++ b/addons/web_diagram/i18n/bs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po index 55f37d40c98..b1bb0413740 100644 --- a/addons/web_diagram/i18n/ca.po +++ b/addons/web_diagram/i18n/ca.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po index ae2cb38a7a0..e895ea9f9f1 100644 --- a/addons/web_diagram/i18n/cs.po +++ b/addons/web_diagram/i18n/cs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po index e41f7b66ba2..3f08f2628d3 100644 --- a/addons/web_diagram/i18n/da.po +++ b/addons/web_diagram/i18n/da.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po index eeb3218ff8f..fd2141deda9 100644 --- a/addons/web_diagram/i18n/de.po +++ b/addons/web_diagram/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po index 4b35de28c9f..81b5cf75d6f 100644 --- a/addons/web_diagram/i18n/en_AU.po +++ b/addons/web_diagram/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po index d9f05d7573f..d52d4ce824a 100644 --- a/addons/web_diagram/i18n/en_GB.po +++ b/addons/web_diagram/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po index 7f63afd478a..48697563bf6 100644 --- a/addons/web_diagram/i18n/es.po +++ b/addons/web_diagram/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po index 135ba58ca6b..34b1b5774cf 100644 --- a/addons/web_diagram/i18n/es_CL.po +++ b/addons/web_diagram/i18n/es_CL.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po index 485f7829b27..569afa58873 100644 --- a/addons/web_diagram/i18n/es_CR.po +++ b/addons/web_diagram/i18n/es_CR.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "Language: es\n" diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po index 2688f6aae25..d44dd43995f 100644 --- a/addons/web_diagram/i18n/es_DO.po +++ b/addons/web_diagram/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po index 25697fe6723..ae1b359e325 100644 --- a/addons/web_diagram/i18n/es_EC.po +++ b/addons/web_diagram/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po index d250551e2df..e8141dd9fee 100644 --- a/addons/web_diagram/i18n/es_MX.po +++ b/addons/web_diagram/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po index e03b211c90d..e21aa64a36d 100644 --- a/addons/web_diagram/i18n/es_PE.po +++ b/addons/web_diagram/i18n/es_PE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po index 0771b97e923..ba97c3a0690 100644 --- a/addons/web_diagram/i18n/et.po +++ b/addons/web_diagram/i18n/et.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po index 5b89c528abc..9cce8af0be7 100644 --- a/addons/web_diagram/i18n/fa.po +++ b/addons/web_diagram/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po index 219788f0b52..f4c3f2d2cea 100644 --- a/addons/web_diagram/i18n/fi.po +++ b/addons/web_diagram/i18n/fi.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po index 51194aae54d..af53a7470a3 100644 --- a/addons/web_diagram/i18n/fr.po +++ b/addons/web_diagram/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po index 42ad4a54160..c2afd4af9a7 100644 --- a/addons/web_diagram/i18n/gl.po +++ b/addons/web_diagram/i18n/gl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po index 1e8d31ee8c0..0bc1dbcff6a 100644 --- a/addons/web_diagram/i18n/gu.po +++ b/addons/web_diagram/i18n/gu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po index a590e3a2e9f..582a2f68bac 100644 --- a/addons/web_diagram/i18n/hr.po +++ b/addons/web_diagram/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po index f7abd49c3aa..20ce63e4e3a 100644 --- a/addons/web_diagram/i18n/hu.po +++ b/addons/web_diagram/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po index 9404c15cbf0..3b759c2cd25 100644 --- a/addons/web_diagram/i18n/id.po +++ b/addons/web_diagram/i18n/id.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po index e81d72367b9..187179884d8 100644 --- a/addons/web_diagram/i18n/it.po +++ b/addons/web_diagram/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po index 7b110660545..157ab04c503 100644 --- a/addons/web_diagram/i18n/ja.po +++ b/addons/web_diagram/i18n/ja.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po index c4226b544f8..d9f0ace39ba 100644 --- a/addons/web_diagram/i18n/ka.po +++ b/addons/web_diagram/i18n/ka.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po index b5dc371d711..6eb45a6949f 100644 --- a/addons/web_diagram/i18n/ko.po +++ b/addons/web_diagram/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po index 0cf569c5e2f..e71ecdde631 100644 --- a/addons/web_diagram/i18n/lt.po +++ b/addons/web_diagram/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po index 455c253a990..8228806f397 100644 --- a/addons/web_diagram/i18n/mk.po +++ b/addons/web_diagram/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po index 3e94c972fb9..4aa3438c62e 100644 --- a/addons/web_diagram/i18n/mn.po +++ b/addons/web_diagram/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po index 616ce6ec968..1a383bd2e77 100644 --- a/addons/web_diagram/i18n/nb.po +++ b/addons/web_diagram/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po index b76ace565ad..22bb3bc6958 100644 --- a/addons/web_diagram/i18n/nl.po +++ b/addons/web_diagram/i18n/nl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po index d13334339b5..7a6262989e7 100644 --- a/addons/web_diagram/i18n/nl_BE.po +++ b/addons/web_diagram/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po index d724f0aae31..5088e2dec6c 100644 --- a/addons/web_diagram/i18n/pl.po +++ b/addons/web_diagram/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po index a1176ec818b..d385163cf28 100644 --- a/addons/web_diagram/i18n/pt.po +++ b/addons/web_diagram/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po index aea5fa99f57..0a8e91d2fcf 100644 --- a/addons/web_diagram/i18n/pt_BR.po +++ b/addons/web_diagram/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po index c1f683679f9..c9e53652119 100644 --- a/addons/web_diagram/i18n/ro.po +++ b/addons/web_diagram/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po index 755d86e607e..0636227ba0b 100644 --- a/addons/web_diagram/i18n/ru.po +++ b/addons/web_diagram/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po index 81909ad3585..109e4b7cc2f 100644 --- a/addons/web_diagram/i18n/sl.po +++ b/addons/web_diagram/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po index b950c408777..5036ddf7b9b 100644 --- a/addons/web_diagram/i18n/sq.po +++ b/addons/web_diagram/i18n/sq.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po index da052b44988..765fae818f0 100644 --- a/addons/web_diagram/i18n/sr@latin.po +++ b/addons/web_diagram/i18n/sr@latin.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po index c2c4b6ad665..4a5cf1f5670 100644 --- a/addons/web_diagram/i18n/sv.po +++ b/addons/web_diagram/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po index 773c5a7ccde..bc9267ddd4a 100644 --- a/addons/web_diagram/i18n/th.po +++ b/addons/web_diagram/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po index 7934bc92962..423b8f33f15 100644 --- a/addons/web_diagram/i18n/tr.po +++ b/addons/web_diagram/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po index 617066aa739..e51b3b0a3bf 100644 --- a/addons/web_diagram/i18n/zh_CN.po +++ b/addons/web_diagram/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po index 90c26e53c4b..437f112742b 100644 --- a/addons/web_diagram/i18n/zh_TW.po +++ b/addons/web_diagram/i18n/zh_TW.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_diagram diff --git a/addons/web_diagram/static/lib/js/Curry-1.0.1.js b/addons/web_diagram/static/lib/js/Curry-1.0.1.js deleted file mode 100644 index f5aa0f993a6..00000000000 --- a/addons/web_diagram/static/lib/js/Curry-1.0.1.js +++ /dev/null @@ -1,29 +0,0 @@ -/**
- * Curry - Function currying
- * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
- * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
- * Date: 10/4/2008
- *
- * @author Ariel Flesler
- * @version 1.0.1
- */
-
-function curry( fn ){
- return function(){
- var args = curry.args(arguments),
- master = arguments.callee,
- self = this;
-
- return args.length >= fn.length ? fn.apply(self,args) : function(){
- return master.apply( self, args.concat(curry.args(arguments)) );
- };
- };
-};
-
-curry.args = function( args ){
- return Array.prototype.slice.call(args);
-};
-
-Function.prototype.curry = function(){
- return curry(this);
-};
\ No newline at end of file diff --git a/addons/web_diagram/static/lib/js/seedrandom.js b/addons/web_diagram/static/lib/js/seedrandom.js deleted file mode 100644 index ce8ce8b578e..00000000000 --- a/addons/web_diagram/static/lib/js/seedrandom.js +++ /dev/null @@ -1,266 +0,0 @@ -// seedrandom.js -// Author: David Bau 3/11/2010 -// -// Defines a method Math.seedrandom() that, when called, substitutes -// an explicitly seeded RC4-based algorithm for Math.random(). Also -// supports automatic seeding from local or network sources of entropy. -// -// Usage: -// -// <script src=http://davidbau.com/encode/seedrandom-min.js></script> -// -// Math.seedrandom('yipee'); Sets Math.random to a function that is -// initialized using the given explicit seed. -// -// Math.seedrandom(); Sets Math.random to a function that is -// seeded using the current time, dom state, -// and other accumulated local entropy. -// The generated seed string is returned. -// -// Math.seedrandom('yowza', true); -// Seeds using the given explicit seed mixed -// together with accumulated entropy. -// -// <script src="http://bit.ly/srandom-512"></script> -// Seeds using physical random bits downloaded -// from random.org. -// -// Examples: -// -// Math.seedrandom("hello"); // Use "hello" as the seed. -// document.write(Math.random()); // Always 0.5463663768140734 -// document.write(Math.random()); // Always 0.43973793770592234 -// var rng1 = Math.random; // Remember the current prng. -// -// var autoseed = Math.seedrandom(); // New prng with an automatic seed. -// document.write(Math.random()); // Pretty much unpredictable. -// -// Math.random = rng1; // Continue "hello" prng sequence. -// document.write(Math.random()); // Always 0.554769432473455 -// -// Math.seedrandom(autoseed); // Restart at the previous seed. -// document.write(Math.random()); // Repeat the 'unpredictable' value. -// -// Notes: -// -// Each time seedrandom('arg') is called, entropy from the passed seed -// is accumulated in a pool to help generate future seeds for the -// zero-argument form of Math.seedrandom, so entropy can be injected over -// time by calling seedrandom with explicit data repeatedly. -// -// On speed - This javascript implementation of Math.random() is about -// 3-10x slower than the built-in Math.random() because it is not native -// code, but this is typically fast enough anyway. Seeding is more expensive, -// especially if you use auto-seeding. Some details (timings on Chrome 4): -// -// Our Math.random() - avg less than 0.002 milliseconds per call -// seedrandom('explicit') - avg less than 0.5 milliseconds per call -// seedrandom('explicit', true) - avg less than 2 milliseconds per call -// seedrandom() - avg about 38 milliseconds per call -// -// LICENSE (BSD): -// -// Copyright 2010 David Bau, all rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of this module nor the names of its contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/** - * All code is in an anonymous closure to keep the global namespace clean. - * - * @param {number=} overflow - * @param {number=} startdenom - */ -(function (pool, math, width, chunks, significance, overflow, startdenom) { - - -// -// seedrandom() -// This is the seedrandom function described above. -// -math['seedrandom'] = function seedrandom(seed, use_entropy) { - var key = []; - var arc4; - - // Flatten the seed string or build one from local entropy if needed. - seed = mixkey(flatten( - use_entropy ? [seed, pool] : - arguments.length ? seed : - [new Date().getTime(), pool, window], 3), key); - - // Use the seed to initialize an ARC4 generator. - arc4 = new ARC4(key); - - // Mix the randomness into accumulated entropy. - mixkey(arc4.S, pool); - - // Override Math.random - - // This function returns a random double in [0, 1) that contains - // randomness in every bit of the mantissa of the IEEE 754 value. - - math['random'] = function random() { // Closure to return a random double: - var n = arc4.g(chunks); // Start with a numerator n < 2 ^ 48 - var d = startdenom; // and denominator d = 2 ^ 48. - var x = 0; // and no 'extra last byte'. - while (n < significance) { // Fill up all significant digits by - n = (n + x) * width; // shifting numerator and - d *= width; // denominator and generating a - x = arc4.g(1); // new least-significant-byte. - } - while (n >= overflow) { // To avoid rounding up, before adding - n /= 2; // last byte, shift everything - d /= 2; // right using integer math until - x >>>= 1; // we have exactly the desired bits. - } - return (n + x) / d; // Form the number within [0, 1). - }; - - // Return the seed that was used - return seed; -}; - -// -// ARC4 -// -// An ARC4 implementation. The constructor takes a key in the form of -// an array of at most (width) integers that should be 0 <= x < (width). -// -// The g(count) method returns a pseudorandom integer that concatenates -// the next (count) outputs from ARC4. Its return value is a number x -// that is in the range 0 <= x < (width ^ count). -// -/** @constructor */ -function ARC4(key) { - var t, u, me = this, keylen = key.length; - var i = 0, j = me.i = me.j = me.m = 0; - me.S = []; - me.c = []; - - // The empty key [] is treated as [0]. - if (!keylen) { key = [keylen++]; } - - // Set up S using the standard key scheduling algorithm. - while (i < width) { me.S[i] = i++; } - for (i = 0; i < width; i++) { - t = me.S[i]; - j = lowbits(j + t + key[i % keylen]); - u = me.S[j]; - me.S[i] = u; - me.S[j] = t; - } - - // The "g" method returns the next (count) outputs as one number. - me.g = function getnext(count) { - var s = me.S; - var i = lowbits(me.i + 1); var t = s[i]; - var j = lowbits(me.j + t); var u = s[j]; - s[i] = u; - s[j] = t; - var r = s[lowbits(t + u)]; - while (--count) { - i = lowbits(i + 1); t = s[i]; - j = lowbits(j + t); u = s[j]; - s[i] = u; - s[j] = t; - r = r * width + s[lowbits(t + u)]; - } - me.i = i; - me.j = j; - return r; - }; - // For robust unpredictability discard an initial batch of values. - // See http://www.rsa.com/rsalabs/node.asp?id=2009 - me.g(width); -} - -// -// flatten() -// Converts an object tree to nested arrays of strings. -// -/** @param {Object=} result - * @param {string=} prop */ -function flatten(obj, depth, result, prop) { - result = []; - if (depth && typeof(obj) == 'object') { - for (prop in obj) { - if (prop.indexOf('S') < 5) { // Avoid FF3 bug (local/sessionStorage) - try { result.push(flatten(obj[prop], depth - 1)); } catch (e) {} - } - } - } - return result.length ? result : '' + obj; -} - -// -// mixkey() -// Mixes a string seed into a key that is an array of integers, and -// returns a shortened string seed that is equivalent to the result key. -// -/** @param {number=} smear - * @param {number=} j */ -function mixkey(seed, key, smear, j) { - seed += ''; // Ensure the seed is a string - smear = 0; - for (j = 0; j < seed.length; j++) { - key[lowbits(j)] = - lowbits((smear ^= key[lowbits(j)] * 19) + seed.charCodeAt(j)); - } - seed = ''; - for (j in key) { seed += String.fromCharCode(key[j]); } - return seed; -} - -// -// lowbits() -// A quick "n mod width" for width a power of 2. -// -function lowbits(n) { return n & (width - 1); } - -// -// The following constants are related to IEEE 754 limits. -// -startdenom = math.pow(width, chunks); -significance = math.pow(2, significance); -overflow = significance * 2; - -// -// When seedrandom.js is loaded, we immediately mix a few bits -// from the built-in RNG into the entropy pool. Because we do -// not want to intefere with determinstic PRNG state later, -// seedrandom will not call math.random on its own again after -// initialization. -// -mixkey(math.random(), pool); - -// End anonymous scope, and pass initial values. -})( - [], // pool: entropy pool starts empty - Math, // math: package containing random, pow, and seedrandom - 256, // width: each RC4 output is 0 <= x < 256 - 6, // chunks: at least six RC4 outputs for each double - 52 // significance: there are 52 significant digits in a double -); diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 77876c9dc52..34dc5e084c7 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -24,6 +24,15 @@ instance.web.DiagramView = instance.web.View.extend({ this.ids = this.dataset.ids; this.on('pager_action_executed', self, self.pager_action_trigger); }, + start: function () { + return this._super().then(function () { + return $.when( + openerp.webclient.session.load_js(['/web/js/web_diagram.assets_raphael']) + ); + }).fail(function () { + throw new Error("Could not load raphael.js"); + }); + }, view_loading: function(r) { return this.load_diagram(r); diff --git a/addons/web_diagram/views/web_diagram.xml b/addons/web_diagram/views/web_diagram.xml new file mode 100644 index 00000000000..23ff7b96e5d --- /dev/null +++ b/addons/web_diagram/views/web_diagram.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_diagram assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_diagram/static/src/css/base_diagram.css"/> + + <script type="text/javascript" src="/web_diagram/static/lib/js/jquery.mousewheel.js"></script> + <script type="text/javascript" src="/web_diagram/static/lib/js/raphael.js"></script> + + <script type="text/javascript" src="/web_diagram/static/src/js/vec2.js"></script> + <script type="text/javascript" src="/web_diagram/static/src/js/graph.js"></script> + <script type="text/javascript" src="/web_diagram/static/src/js/diagram.js"></script> + </xpath> + </template> + <template id="assets_raphael" name="raphael.js"> + </template> + </data> +</openerp> diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py index 3fef67a55f6..af0e59ccb28 100644 --- a/addons/web_gantt/__openerp__.py +++ b/addons/web_gantt/__openerp__.py @@ -8,12 +8,9 @@ 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' + 'data' : [ + 'views/web_gantt.xml', ], - 'css': ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'], 'qweb': [ 'static/src/xml/*.xml', ], diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po index 07cd03e6259..1b75f7676ac 100644 --- a/addons/web_gantt/i18n/ar.po +++ b/addons/web_gantt/i18n/ar.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po index bea5a58c6c0..ecaddf805f2 100644 --- a/addons/web_gantt/i18n/bg.po +++ b/addons/web_gantt/i18n/bg.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po index 7552ce1a30f..08fe052313f 100644 --- a/addons/web_gantt/i18n/bn.po +++ b/addons/web_gantt/i18n/bn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po index 6d41aa1cca1..71bb87f7314 100644 --- a/addons/web_gantt/i18n/bs.po +++ b/addons/web_gantt/i18n/bs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po index 629c654a5d4..5a6d4324012 100644 --- a/addons/web_gantt/i18n/ca.po +++ b/addons/web_gantt/i18n/ca.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po index bdda9107322..7168f2a7622 100644 --- a/addons/web_gantt/i18n/cs.po +++ b/addons/web_gantt/i18n/cs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po index b4f5178fb09..961800a24a4 100644 --- a/addons/web_gantt/i18n/da.po +++ b/addons/web_gantt/i18n/da.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po index 9058c3dfc13..d8727cc0b10 100644 --- a/addons/web_gantt/i18n/de.po +++ b/addons/web_gantt/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po index 8450388b998..057a820ce0a 100644 --- a/addons/web_gantt/i18n/en_AU.po +++ b/addons/web_gantt/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po index 445a53f0db5..cfaf80b1199 100644 --- a/addons/web_gantt/i18n/en_GB.po +++ b/addons/web_gantt/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po index 05e8ac2845c..ec793d96122 100644 --- a/addons/web_gantt/i18n/es.po +++ b/addons/web_gantt/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po index 051a38cb3e4..19ff52be2c4 100644 --- a/addons/web_gantt/i18n/es_CL.po +++ b/addons/web_gantt/i18n/es_CL.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po index 282f7f450c8..5b96d05e5c8 100644 --- a/addons/web_gantt/i18n/es_CR.po +++ b/addons/web_gantt/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po index fba006729c1..c50895c12e1 100644 --- a/addons/web_gantt/i18n/es_DO.po +++ b/addons/web_gantt/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po index 4bae50b2a74..9e205c2415b 100644 --- a/addons/web_gantt/i18n/es_EC.po +++ b/addons/web_gantt/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po index e5eb30a96e9..94064077699 100644 --- a/addons/web_gantt/i18n/es_MX.po +++ b/addons/web_gantt/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po index bbc4a9e0043..ed64e9cee08 100644 --- a/addons/web_gantt/i18n/et.po +++ b/addons/web_gantt/i18n/et.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po index 92ed0acb3d1..1c4f56703b1 100644 --- a/addons/web_gantt/i18n/fa.po +++ b/addons/web_gantt/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po index a30c0413bd1..2488ab36826 100644 --- a/addons/web_gantt/i18n/fi.po +++ b/addons/web_gantt/i18n/fi.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po index 51e660f70c6..839041d510f 100644 --- a/addons/web_gantt/i18n/fr.po +++ b/addons/web_gantt/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po index 6ae258c4c16..f6b9398b408 100644 --- a/addons/web_gantt/i18n/gl.po +++ b/addons/web_gantt/i18n/gl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po index 74462937a37..7b9e2036292 100644 --- a/addons/web_gantt/i18n/gu.po +++ b/addons/web_gantt/i18n/gu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/he.po b/addons/web_gantt/i18n/he.po index 7a8f4138474..b42affa93b2 100644 --- a/addons/web_gantt/i18n/he.po +++ b/addons/web_gantt/i18n/he.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po index 63f7da98deb..7b153a32342 100644 --- a/addons/web_gantt/i18n/hr.po +++ b/addons/web_gantt/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po index bbaef6ec231..b1bb95da104 100644 --- a/addons/web_gantt/i18n/hu.po +++ b/addons/web_gantt/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po index 64bbf847c17..79df06f3576 100644 --- a/addons/web_gantt/i18n/it.po +++ b/addons/web_gantt/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po index 5c99bbc804a..77930c1882a 100644 --- a/addons/web_gantt/i18n/ja.po +++ b/addons/web_gantt/i18n/ja.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po index d83249a6f81..fa3c303f883 100644 --- a/addons/web_gantt/i18n/ka.po +++ b/addons/web_gantt/i18n/ka.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po index aa6861a8fa8..7132083b32b 100644 --- a/addons/web_gantt/i18n/ko.po +++ b/addons/web_gantt/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po index efb24e63432..2278420a9a2 100644 --- a/addons/web_gantt/i18n/lo.po +++ b/addons/web_gantt/i18n/lo.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po index 21f30ae4c96..6cf660145f5 100644 --- a/addons/web_gantt/i18n/lt.po +++ b/addons/web_gantt/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po index d6a8a9a2613..af7fd92975f 100644 --- a/addons/web_gantt/i18n/mk.po +++ b/addons/web_gantt/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po index 7d76b83d4e4..00f8e020559 100644 --- a/addons/web_gantt/i18n/mn.po +++ b/addons/web_gantt/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po index 4fd569f65eb..382f055755e 100644 --- a/addons/web_gantt/i18n/nb.po +++ b/addons/web_gantt/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po index f8dd2be949c..d33457b3e68 100644 --- a/addons/web_gantt/i18n/nl.po +++ b/addons/web_gantt/i18n/nl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po index 65518c91089..b61d044f865 100644 --- a/addons/web_gantt/i18n/nl_BE.po +++ b/addons/web_gantt/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po index c589a4bfd84..200e43c89b6 100644 --- a/addons/web_gantt/i18n/pl.po +++ b/addons/web_gantt/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po index 9e1e8369802..2bc5a0c2ca9 100644 --- a/addons/web_gantt/i18n/pt.po +++ b/addons/web_gantt/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po index 3d599d94cac..9d688c7b37f 100644 --- a/addons/web_gantt/i18n/pt_BR.po +++ b/addons/web_gantt/i18n/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po index bfd9d6652e1..0fa3c7448e7 100644 --- a/addons/web_gantt/i18n/ro.po +++ b/addons/web_gantt/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po index 48edc4f5cce..f46f3521cd6 100644 --- a/addons/web_gantt/i18n/ru.po +++ b/addons/web_gantt/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po index 75441cf5bef..2c04b4b1da2 100644 --- a/addons/web_gantt/i18n/sl.po +++ b/addons/web_gantt/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po index 8fbcfba67c6..117a71abeda 100644 --- a/addons/web_gantt/i18n/sq.po +++ b/addons/web_gantt/i18n/sq.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po index 4239553c324..bc0d8eb0958 100644 --- a/addons/web_gantt/i18n/sr@latin.po +++ b/addons/web_gantt/i18n/sr@latin.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po index b28df71199e..1282871fd56 100644 --- a/addons/web_gantt/i18n/sv.po +++ b/addons/web_gantt/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po index 9487057005b..41ac3af1a06 100644 --- a/addons/web_gantt/i18n/th.po +++ b/addons/web_gantt/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po index 7c9c30278d6..16796839777 100644 --- a/addons/web_gantt/i18n/tr.po +++ b/addons/web_gantt/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po index 4ca914e3bcd..8fccfde27af 100644 --- a/addons/web_gantt/i18n/zh_CN.po +++ b/addons/web_gantt/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_gantt diff --git a/addons/web_gantt/views/web_gantt.xml b/addons/web_gantt/views/web_gantt.xml new file mode 100644 index 00000000000..1696d3228ab --- /dev/null +++ b/addons/web_gantt/views/web_gantt.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_gantt assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_gantt/static/src/css/gantt.css"/> + <link rel="stylesheet" href="/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css"/> + + <script type="text/javascript" src="/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js"></script> + <script type="text/javascript" src="/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js"></script> + <script type="text/javascript" src="/web_gantt/static/src/js/gantt.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py index 790dbe85c44..85c1283dfad 100644 --- a/addons/web_graph/__openerp__.py +++ b/addons/web_graph/__openerp__.py @@ -14,15 +14,8 @@ Graph Views for Web Client. """, 'version': '3.0', 'depends': ['web'], - 'js': [ - 'static/lib/nvd3/d3.v3.js', - 'static/lib/nvd3/nv.d3.js', - 'static/src/js/graph_view.js', - 'static/src/js/pivot_table.js', - 'static/src/js/graph_widget.js', - ], - 'css': [ - 'static/src/css/*.css', + 'data' : [ + 'views/web_graph.xml', ], 'qweb' : [ 'static/src/xml/*.xml', diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po index 139f117a088..a4ce2a68fdf 100644 --- a/addons/web_graph/i18n/ar.po +++ b/addons/web_graph/i18n/ar.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po index 01d05d1a65e..54207287ab7 100644 --- a/addons/web_graph/i18n/bg.po +++ b/addons/web_graph/i18n/bg.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po index be44b553b03..357ffe49d32 100644 --- a/addons/web_graph/i18n/bn.po +++ b/addons/web_graph/i18n/bn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po index 28d88294517..16b40383c5b 100644 --- a/addons/web_graph/i18n/bs.po +++ b/addons/web_graph/i18n/bs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po index 19f873ccf7c..7a3564a8f7d 100644 --- a/addons/web_graph/i18n/ca.po +++ b/addons/web_graph/i18n/ca.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po index 877aaf28893..09572c410f1 100644 --- a/addons/web_graph/i18n/cs.po +++ b/addons/web_graph/i18n/cs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po index 331eff06bc9..8b6d9872a99 100644 --- a/addons/web_graph/i18n/da.po +++ b/addons/web_graph/i18n/da.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po index cb64d594ac2..e3761f90a6d 100644 --- a/addons/web_graph/i18n/de.po +++ b/addons/web_graph/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po index 589fec49159..92976c9bca5 100644 --- a/addons/web_graph/i18n/en_AU.po +++ b/addons/web_graph/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po index 7cc8f41cfe3..c01f6d721b0 100644 --- a/addons/web_graph/i18n/en_GB.po +++ b/addons/web_graph/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po index 20ef2dfe49b..1725cc59f3c 100644 --- a/addons/web_graph/i18n/es.po +++ b/addons/web_graph/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po index c480b1520d1..f2a6c73e37d 100644 --- a/addons/web_graph/i18n/es_CL.po +++ b/addons/web_graph/i18n/es_CL.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po index ff1c136269d..30d598242ac 100644 --- a/addons/web_graph/i18n/es_CR.po +++ b/addons/web_graph/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po index e36cea4be83..26146369143 100644 --- a/addons/web_graph/i18n/es_DO.po +++ b/addons/web_graph/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po index 698ac517bb2..21dac0c3614 100644 --- a/addons/web_graph/i18n/es_EC.po +++ b/addons/web_graph/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po index 2011daa1b2f..f2349d82caf 100644 --- a/addons/web_graph/i18n/es_MX.po +++ b/addons/web_graph/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po index 3f3f71ee231..fd3d590ce67 100644 --- a/addons/web_graph/i18n/et.po +++ b/addons/web_graph/i18n/et.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po index 148e9a03059..25035a8034a 100644 --- a/addons/web_graph/i18n/fa.po +++ b/addons/web_graph/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po index eeb014f4032..75dcda30f68 100644 --- a/addons/web_graph/i18n/fi.po +++ b/addons/web_graph/i18n/fi.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po index 7c3924df977..a2b58ef93ca 100644 --- a/addons/web_graph/i18n/fr.po +++ b/addons/web_graph/i18n/fr.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po index d0835bf2c75..27c0282f6f2 100644 --- a/addons/web_graph/i18n/fr_CA.po +++ b/addons/web_graph/i18n/fr_CA.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po index 199c68d0a36..671a1b1f2af 100644 --- a/addons/web_graph/i18n/gl.po +++ b/addons/web_graph/i18n/gl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po index a40afd18997..505723aad9a 100644 --- a/addons/web_graph/i18n/gu.po +++ b/addons/web_graph/i18n/gu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/he.po b/addons/web_graph/i18n/he.po index 624c7835506..11050f22155 100644 --- a/addons/web_graph/i18n/he.po +++ b/addons/web_graph/i18n/he.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po index a7c0adf0281..4ae91d533c6 100644 --- a/addons/web_graph/i18n/hr.po +++ b/addons/web_graph/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po index 1864fb5ef23..0b2bc83c5e6 100644 --- a/addons/web_graph/i18n/hu.po +++ b/addons/web_graph/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po index fda89ac1f56..0ee1fee88d9 100644 --- a/addons/web_graph/i18n/it.po +++ b/addons/web_graph/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po index e3a5cc77dd8..c9621fb5a61 100644 --- a/addons/web_graph/i18n/ja.po +++ b/addons/web_graph/i18n/ja.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po index 74d697b8bc8..b380aa59a94 100644 --- a/addons/web_graph/i18n/ka.po +++ b/addons/web_graph/i18n/ka.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po index 4d658245f59..6245d2b07bc 100644 --- a/addons/web_graph/i18n/ko.po +++ b/addons/web_graph/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po index 5f35be995f6..f480e629a6a 100644 --- a/addons/web_graph/i18n/lt.po +++ b/addons/web_graph/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po index 2dc5d811c02..6cfb261b598 100644 --- a/addons/web_graph/i18n/mk.po +++ b/addons/web_graph/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po index dfe35b0b2cc..577a231cd2f 100644 --- a/addons/web_graph/i18n/mn.po +++ b/addons/web_graph/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po index 72bea187685..2f3f618c5f6 100644 --- a/addons/web_graph/i18n/nb.po +++ b/addons/web_graph/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po index fe092ea5b54..797b104dd34 100644 --- a/addons/web_graph/i18n/nl.po +++ b/addons/web_graph/i18n/nl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po index 85c31713aeb..cb5e17915d9 100644 --- a/addons/web_graph/i18n/nl_BE.po +++ b/addons/web_graph/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po index b76954c3140..1da14fe898b 100644 --- a/addons/web_graph/i18n/pl.po +++ b/addons/web_graph/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po index b9c952aff16..439b636d0f5 100644 --- a/addons/web_graph/i18n/pt.po +++ b/addons/web_graph/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po index 9d9cc7cadfd..4b8c685265e 100644 --- a/addons/web_graph/i18n/pt_BR.po +++ b/addons/web_graph/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po index 0e87c56287d..096eb7399c1 100644 --- a/addons/web_graph/i18n/ro.po +++ b/addons/web_graph/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po index 7fda09690b6..342854414b5 100644 --- a/addons/web_graph/i18n/ru.po +++ b/addons/web_graph/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po index 0d752fd9a87..4d19f47f674 100644 --- a/addons/web_graph/i18n/sl.po +++ b/addons/web_graph/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po index 20acce79f17..4c961ff49d0 100644 --- a/addons/web_graph/i18n/sq.po +++ b/addons/web_graph/i18n/sq.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po index f288a2513bd..956f58e46bc 100644 --- a/addons/web_graph/i18n/sr@latin.po +++ b/addons/web_graph/i18n/sr@latin.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po index 6560d2eb89e..d1a6d343356 100644 --- a/addons/web_graph/i18n/sv.po +++ b/addons/web_graph/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po index 451f8ee2ccb..9db95a05d93 100644 --- a/addons/web_graph/i18n/th.po +++ b/addons/web_graph/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po index e47efb1ce9e..0222c3a0db7 100644 --- a/addons/web_graph/i18n/tr.po +++ b/addons/web_graph/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po index 1ab893a82fa..9e2e51bc123 100644 --- a/addons/web_graph/i18n/zh_CN.po +++ b/addons/web_graph/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_graph diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js index 25a1f932cc4..e4e074b2e7f 100644 --- a/addons/web_graph/static/src/js/graph_view.js +++ b/addons/web_graph/static/src/js/graph_view.js @@ -167,7 +167,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ row_search_facet = query.findWhere({category:'GroupBy'}); if (row_search_facet) { - row_search_facet.values.reset(row_facet.values); + row_search_facet.values.reset(row_facet.values, {focus_input:false}); } else { if (row_groupby.length) { query.add(row_facet); @@ -181,7 +181,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ col_search_facet = query.findWhere({category:'ColGroupBy'}); if (col_search_facet) { - col_search_facet.values.reset(col_facet.values); + col_search_facet.values.reset(col_facet.values, {focus_input:false}); } else { if (col_groupby.length) { query.add(col_facet); diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js index 317ea6cbfb9..9946e149d96 100644 --- a/addons/web_graph/static/src/js/graph_widget.js +++ b/addons/web_graph/static/src/js/graph_widget.js @@ -43,8 +43,15 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ this.$('.graph_main_content').addClass('graph_pivot_mode'); } + // get search view + var parent = this.getParent(); + while (!(parent instanceof openerp.web.ViewManager)) { + parent = parent.getParent(); + } + this.search_view = parent.searchview; + openerp.session.rpc('/web_graph/check_xlwt').then(function (result) { - self.$('.graph_options_selection label').toggle(result); + self.$('.graph_options_selection label').last().toggle(result); }); return this.model.call('fields_get', []).then(function (f) { @@ -76,16 +83,9 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ // this method gets the fields that appear in the search view, under the // 'Groupby' heading get_search_fields: function () { - var self = this, - parent = this.getParent(); - - while (!(parent instanceof openerp.web.ViewManager)) { - parent = parent.getParent(); - } - - var search_view = parent.searchview; + var self = this; - var groupbygroups = _(search_view.inputs).select(function (g) { + var groupbygroups = _(this.search_view.inputs).select(function (g) { return g instanceof openerp.web.search.GroupbyGroup; }); @@ -260,21 +260,12 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ option_selection: function (event) { event.preventDefault(); switch (event.currentTarget.getAttribute('data-choice')) { - case 'bar_grouped': - this.bar_ui = 'group'; - if (this.mode === 'bar') { - this.display_data(); - } - break; - case 'bar_stacked': - this.bar_ui = 'stack'; - if (this.mode === 'bar') { - this.display_data(); - } - break; case 'swap_axis': this.swap_axis(); break; + case 'expand_all': + this.pivot.expand_all().then(this.proxy('display_data')); + break; case 'update_values': this.pivot.update_data().then(this.proxy('display_data')); break; @@ -305,11 +296,11 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ if (header.expanded) { this.fold(header); return; - } + } if (header.path.length < header.root.groupby.length) { this.expand(id); return; - } + } if (!this.important_fields.length) { return; } @@ -453,55 +444,67 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ build_rows: function (raw) { var self = this, pivot = this.pivot, - m, i, cell; - - return _.map(pivot.rows.headers, function (row) { - var cells = []; - var pivot_cells = []; - for (i = 0; i < pivot.cells.length; i++) { - if (pivot.cells[i].x == row.id || pivot.cells[i].y == row.id) { - pivot_cells.push(pivot.cells[i]); - } + m, i, j, k, cell, row; + + var rows = []; + var cells, pivot_cells, values; + + var nbr_of_rows = pivot.rows.headers.length; + var col_headers = pivot.get_cols_leaves(); + + for (i = 0; i < nbr_of_rows; i++) { + row = pivot.rows.headers[i]; + cells = []; + pivot_cells = []; + for (j = 0; j < pivot.cells.length; j++) { + if (pivot.cells[j].x == row.id || pivot.cells[j].y == row.id) { + pivot_cells.push(pivot.cells[j]); + } } - _.each(pivot.get_cols_leaves(), function (col) { - var values; - for (i = 0; i < pivot_cells.length; i++) { - if (pivot_cells[i].x == col.id || pivot_cells[i].y == col.id) { - values = pivot_cells[i].values; + + for (j = 0; j < col_headers.length; j++) { + values = undefined; + for (k = 0; k < pivot_cells.length; k++) { + if (pivot_cells[k].x == col_headers[j].id || pivot_cells[k].y == col_headers[j].id) { + values = pivot_cells[k].values; break; - } + } } if (!values) { values = new Array(pivot.measures.length);} for (m = 0; m < pivot.measures.length; m++) { - cells.push(self.make_cell(row,col,values[m], m, raw)); + cells.push(self.make_cell(row,col_headers[j],values[m], m, raw)); } - }); - if (pivot.get_cols_leaves().length > 1) { + } + if (col_headers.length > 1) { var totals = pivot.get_total(row); for (m = 0; m < pivot.measures.length; m++) { - cell = self.make_cell(row, pivot.main_col(), totals[m], m, raw); + cell = self.make_cell(row, pivot.cols.headers[0], totals[m], m, raw); cell.is_bold = 'true'; cells.push(cell); } } - return { + rows.push({ id: row.id, indent: row.path.length, title: row.title, expanded: row.expanded, cells: cells, - }; - }); + }); + } + + return rows; }, // ---------------------------------------------------------------------- // Main display method // ---------------------------------------------------------------------- display_data: function () { + var scroll = $(window).scrollTop(); this.$('.graph_main_content svg').remove(); this.$('.graph_main_content div').remove(); this.table.empty(); this.table.toggleClass('heatmap', this.heatmap_mode !== 'none'); + this.$('.graph_options_selection label').last().toggleClass('disabled', this.pivot.no_data); this.width = this.$el.width(); this.height = Math.min(Math.max(document.documentElement.clientHeight - 116 - 60, 250), Math.round(0.8*this.$el.width())); @@ -511,6 +514,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ } else { if (this.mode === 'pivot') { this.draw_table(); + $(window).scrollTop(scroll); } else { this.$('.graph_main_content').append($('<div><svg>')); this.svg = this.$('.graph_main_content svg')[0]; @@ -524,9 +528,11 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ // ---------------------------------------------------------------------- draw_table: function () { var table = this.build_table(); - this.draw_headers(table.headers); - this.draw_measure_row(table.measure_row); - this.draw_rows(table.rows); + var doc_fragment = $(document.createDocumentFragment()); + this.draw_headers(table.headers, doc_fragment); + this.draw_measure_row(table.measure_row, doc_fragment); + this.draw_rows(table.rows, doc_fragment); + this.table.append(doc_fragment); }, make_header_cell: function (header) { @@ -549,7 +555,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ return cell.append(content); }, - draw_headers: function (headers) { + draw_headers: function (headers, doc_fragment) { var make_cell = this.make_header_cell, empty_cell = $('<th>').attr('rowspan', headers.length), thead = $('<thead>'); @@ -562,10 +568,11 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ thead.append(html_row); }); thead.children(':first').prepend(empty_cell); - this.table.append(thead); + doc_fragment.append(thead); + this.thead = thead; }, - draw_measure_row: function (measure_row) { + draw_measure_row: function (measure_row, doc_fragment) { if (this.pivot.measures.length === 1) { return; } var html_row = $('<tr>').append('<th>'); _.each(measure_row, function (cell) { @@ -573,25 +580,39 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ if (cell.is_bold) {measure_cell.css('font-weight', 'bold');} html_row.append(measure_cell); }); - this.$('thead').append(html_row); + this.thead.append(html_row); }, - draw_rows: function (rows) { - var table = this.table, - make_cell = this.make_header_cell; - - _.each(rows, function (row) { - var html_row = $('<tr>').append(make_cell(row)); - _.each(row.cells, function (cell) { - var html_cell = $('<td>').text(cell.value); - if (_.has(cell, 'color')) { - html_cell.css('background-color', $.Color(255, cell.color, cell.color)); + draw_rows: function (rows, doc_fragment) { + var make_cell = this.make_header_cell, + cell, + html_row, i, j; + + var cells_list, + hcell, + rows_length, cells_length; + + rows_length = rows.length; + for (i = 0; i < rows_length; i++) { + html_row = $('<tr>').append(make_cell(rows[i])); + cells_length = rows[i].cells.length; + cells_list = []; + + for (j = 0; j < cells_length; j++) { + cell = rows[i].cells[j]; + hcell = '<td'; + if (cell.is_bold || cell.color) { + hcell += ' style="'; + if (cell.is_bold) hcell += 'font-weight: bold;'; + if (cell.color) hcell += 'background-color:' + $.Color(255, cell.color, cell.color) + ';'; + hcell += '"'; } - if (cell.is_bold) { html_cell.css('font-weight', 'bold'); } - html_row.append(html_cell); - }); - table.append(html_row); - }); + hcell += '>' + cell.value + '</td>'; + cells_list[j] = hcell; + } + html_row.append(cells_list.join('')); + doc_fragment.append($('<tbody>').append(html_row)); + } }, // ---------------------------------------------------------------------- @@ -608,7 +629,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ if ((dim_x === 0) && (dim_y === 0)) { data = [{key: _t('Total'), values:[{ x: _t('Total'), - y: this.pivot.get_total(), + y: this.pivot.get_total()[0], }]}]; // Only column groupbys } else if ((dim_x === 0) && (dim_y >= 1)){ @@ -621,7 +642,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ // Just 1 row groupby } else if ((dim_x === 1) && (dim_y === 0)) { data = _.map(this.pivot.main_row().children, function (pt) { - var value = self.pivot.get_total(pt), + var value = self.pivot.get_total(pt)[0], title = (pt.title !== undefined) ? pt.title : _t('Undefined'); return {x: title, y: value}; }); @@ -658,8 +679,6 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ nv.addGraph(function () { var chart = nv.models.multiBarChart() - .width(self.width) - .height(self.height) .reduceXTicks(false) .stacked(self.bar_ui === 'stack') .showControls(show_controls); @@ -687,9 +706,12 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ dim_x = this.pivot.rows.groupby.length, dim_y = this.pivot.cols.groupby.length; + var rows = this.pivot.get_rows_with_depth(dim_x), + labels = _.pluck(rows, 'title'); + var data = _.map(this.pivot.get_cols_leaves(), function (col) { - var values = _.map(self.pivot.get_rows_with_depth(dim_x), function (row) { - return {x: row.title, y: self.pivot.get_values(row.id,col.id)[0] || 0}; + var values = _.map(rows, function (row, index) { + return {x: index, y: self.pivot.get_values(row.id,col.id)[0] || 0}; }); var title = _.map(col.path, function (p) { return p || _t('Undefined'); @@ -702,10 +724,9 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ nv.addGraph(function () { var chart = nv.models.lineChart() - .x(function (d,u) { return u; }) - .width(self.width) - .height(self.height) - .margin({top: 30, right: 20, bottom: 20, left: 60}); + .x(function (d,u) { return u; }); + + chart.xAxis.tickFormat(function (d,u) {return labels[d];}); d3.select(self.svg) .attr('width', self.width) @@ -727,14 +748,14 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ if (dim_x === 0) { title = self.measure_label; } - return {x: title, y: self.pivot.get_total(row)}; + return {x: title, y: self.pivot.get_total(row)[0]}; }); nv.addGraph(function () { var chart = nv.models.pieChart() - .color(d3.scale.category10().range()) .width(self.width) - .height(self.height); + .height(self.height) + .color(d3.scale.category10().range()); d3.select(self.svg) .datum(data) diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js index 6b12829982e..48ae9ec3830 100644 --- a/addons/web_graph/static/src/js/pivot_table.js +++ b/addons/web_graph/static/src/js/pivot_table.js @@ -14,6 +14,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ this.cells = []; this.domain = domain; this.no_data = true; + this.updating = false; this.model = model; this.fields = fields; this.fields.__count = {type: 'integer', string:_t('Quantity')}; @@ -55,6 +56,13 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ }, set: function (domain, row_groupby, col_groupby) { + var self = this; + if (this.updating) { + return this.updating.then(function () { + self.updating = false; + return self.set(domain, row_groupby,col_groupby); + }); + } var row_gb_changed = !_.isEqual(row_groupby, this.rows.groupby), col_gb_changed = !_.isEqual(col_groupby, this.cols.groupby); @@ -251,7 +259,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ // to null before calling update_data. update_data: function () { var self = this; - return this.perform_requests().then (function () { + this.updating = this.perform_requests().then (function () { var data = Array.prototype.slice.call(arguments); self.no_data = !data[0].length; if (self.no_data) { @@ -273,6 +281,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ self.set_headers(row_headers, self.rows); self.set_headers(col_headers, self.cols); }); + return this.updating; }, make_headers_and_cell: function (data_pts, row_headers, col_headers, index, prefix, expand) { diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml index 4522fd2504f..81804e5a9b1 100644 --- a/addons/web_graph/static/src/xml/web_graph.xml +++ b/addons/web_graph/static/src/xml/web_graph.xml @@ -35,6 +35,9 @@ <label class="btn btn-default" data-choice="swap_axis" title="Swap Axis"> <span class="fa fa-expand"></span> </label> + <label class="btn btn-default" data-choice="expand_all" title="Expand All"> + <span class="fa fa-arrows-alt"></span> + </label> <label class="btn btn-default" data-choice="update_values" title="Reload Data"> <span class="fa fa-refresh"></span> </label> diff --git a/addons/web_graph/views/web_graph.xml b/addons/web_graph/views/web_graph.xml new file mode 100644 index 00000000000..e7e595dffd7 --- /dev/null +++ b/addons/web_graph/views/web_graph.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_graph assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_graph/static/src/css/graph.css"/> + <link rel="stylesheet" href="/web_graph/static/src/css/nv.d3.css"/> + + <script type="text/javascript" src="/web_graph/static/lib/nvd3/d3.v3.js"></script> + <script type="text/javascript" src="/web_graph/static/lib/nvd3/nv.d3.js"></script> + <script type="text/javascript" src="/web_graph/static/src/js/graph_view.js"></script> + <script type="text/javascript" src="/web_graph/static/src/js/pivot_table.js"></script> + <script type="text/javascript" src="/web_graph/static/src/js/graph_widget.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_hello/__init__.py b/addons/web_hello/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 --- a/addons/web_hello/__init__.py +++ /dev/null diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py deleted file mode 100644 index 5d8a4baf597..00000000000 --- a/addons/web_hello/__openerp__.py +++ /dev/null @@ -1,15 +0,0 @@ -{ - '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/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js deleted file mode 100644 index 2043af6d4ea..00000000000 --- a/addons/web_hello/static/openerp/base_hello.js +++ /dev/null @@ -1,16 +0,0 @@ -/*--------------------------------------------------------- - * OpenERP base_hello (Example module) - *---------------------------------------------------------*/ - -openerp.web_hello = function(instance) { - -instance.web.SearchView = instance.web.SearchView.extend({ - init:function() { - this._super.apply(this,arguments); - this.on('search_data', this, function(){console.log('hello');}); - } -}); - -}; - -// vim:et fdc=0 fdl=0: diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py index 233a35a04d2..4fb03b80344 100644 --- a/addons/web_kanban/__openerp__.py +++ b/addons/web_kanban/__openerp__.py @@ -8,11 +8,8 @@ OpenERP Web kanban view. """, 'version': '2.0', 'depends': ['web'], - 'js': [ - 'static/src/js/kanban.js' - ], - 'css': [ - 'static/src/css/kanban.css' + 'data' : [ + 'views/web_kanban.xml', ], 'qweb' : [ 'static/src/xml/*.xml', diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po index 3531c1ff043..5a388f74612 100644 --- a/addons/web_kanban/i18n/ar.po +++ b/addons/web_kanban/i18n/ar.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po index 57bc6d41f6d..9f91a821604 100644 --- a/addons/web_kanban/i18n/bg.po +++ b/addons/web_kanban/i18n/bg.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po index 853bd0226e5..5c4994e8a9e 100644 --- a/addons/web_kanban/i18n/bn.po +++ b/addons/web_kanban/i18n/bn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po index d57682dabc5..72c30bee1c7 100644 --- a/addons/web_kanban/i18n/bs.po +++ b/addons/web_kanban/i18n/bs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po index 8ada40581ed..1dce8757d97 100644 --- a/addons/web_kanban/i18n/ca.po +++ b/addons/web_kanban/i18n/ca.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po index eff7991d469..ed99a0d7620 100644 --- a/addons/web_kanban/i18n/cs.po +++ b/addons/web_kanban/i18n/cs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po index c6c8a14ef18..1477d4ec5eb 100644 --- a/addons/web_kanban/i18n/da.po +++ b/addons/web_kanban/i18n/da.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po index 9fc529c392f..c1049402d0c 100644 --- a/addons/web_kanban/i18n/de.po +++ b/addons/web_kanban/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po index 81a6ef5efcf..94876136385 100644 --- a/addons/web_kanban/i18n/en_AU.po +++ b/addons/web_kanban/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po index 6a428d1137c..c1d5fec1b0f 100644 --- a/addons/web_kanban/i18n/en_GB.po +++ b/addons/web_kanban/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po index 4f1e681edb5..2471954208f 100644 --- a/addons/web_kanban/i18n/es.po +++ b/addons/web_kanban/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po index 8f0ed121724..c75881509e0 100644 --- a/addons/web_kanban/i18n/es_CL.po +++ b/addons/web_kanban/i18n/es_CL.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po index c860a3c01c7..7ca86ba9718 100644 --- a/addons/web_kanban/i18n/es_CR.po +++ b/addons/web_kanban/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po index a8a0668d463..f39ef1767d1 100644 --- a/addons/web_kanban/i18n/es_DO.po +++ b/addons/web_kanban/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po index 53fe87b8a06..c283e4a8340 100644 --- a/addons/web_kanban/i18n/es_EC.po +++ b/addons/web_kanban/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po index 647ddebcae1..bb9d92055ee 100644 --- a/addons/web_kanban/i18n/es_MX.po +++ b/addons/web_kanban/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po index 950ce3e30b8..b4db11e4b92 100644 --- a/addons/web_kanban/i18n/et.po +++ b/addons/web_kanban/i18n/et.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po index 142207efd36..c51d4a71bb2 100644 --- a/addons/web_kanban/i18n/fa.po +++ b/addons/web_kanban/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po index 51862c1a25c..1522169208b 100644 --- a/addons/web_kanban/i18n/fi.po +++ b/addons/web_kanban/i18n/fi.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po index 5ff248f48f8..56f3b475aa1 100644 --- a/addons/web_kanban/i18n/fr.po +++ b/addons/web_kanban/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po index 12b514a3259..cdded673d7b 100644 --- a/addons/web_kanban/i18n/fr_CA.po +++ b/addons/web_kanban/i18n/fr_CA.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po index 3b394e7fe0c..a36b2c86eb6 100644 --- a/addons/web_kanban/i18n/gl.po +++ b/addons/web_kanban/i18n/gl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po index e61467d59fd..fe1ce8d939c 100644 --- a/addons/web_kanban/i18n/gu.po +++ b/addons/web_kanban/i18n/gu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/he.po b/addons/web_kanban/i18n/he.po index 37ae41443b9..ab54a0437f3 100644 --- a/addons/web_kanban/i18n/he.po +++ b/addons/web_kanban/i18n/he.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po index d3a3b34bd50..ead81f5daac 100644 --- a/addons/web_kanban/i18n/hr.po +++ b/addons/web_kanban/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po index 971b8132d42..90639d8ecb8 100644 --- a/addons/web_kanban/i18n/hu.po +++ b/addons/web_kanban/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po index 82765b91e05..38ef72300f0 100644 --- a/addons/web_kanban/i18n/it.po +++ b/addons/web_kanban/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po index a54a3733210..cdd59e5024e 100644 --- a/addons/web_kanban/i18n/ja.po +++ b/addons/web_kanban/i18n/ja.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po index ed948f6949b..bb734cf5cb4 100644 --- a/addons/web_kanban/i18n/ka.po +++ b/addons/web_kanban/i18n/ka.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po index faabd3cbf01..a5126f064cb 100644 --- a/addons/web_kanban/i18n/ko.po +++ b/addons/web_kanban/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po index 9d36e256a04..8d06014f397 100644 --- a/addons/web_kanban/i18n/lt.po +++ b/addons/web_kanban/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po index 9a7578167d0..8ec6d480204 100644 --- a/addons/web_kanban/i18n/mk.po +++ b/addons/web_kanban/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po index 941a6946f0c..da087e4764a 100644 --- a/addons/web_kanban/i18n/mn.po +++ b/addons/web_kanban/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po index 0e9981acc63..7ac755332d1 100644 --- a/addons/web_kanban/i18n/nb.po +++ b/addons/web_kanban/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po index f29322f3936..4388e717ac1 100644 --- a/addons/web_kanban/i18n/nl.po +++ b/addons/web_kanban/i18n/nl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po index 60ba739876a..ff2c8b1de88 100644 --- a/addons/web_kanban/i18n/nl_BE.po +++ b/addons/web_kanban/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po index 6abf4f2903d..449d4709334 100644 --- a/addons/web_kanban/i18n/pl.po +++ b/addons/web_kanban/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po index add89bf7b15..cbf7c36f8de 100644 --- a/addons/web_kanban/i18n/pt.po +++ b/addons/web_kanban/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po index 3b95f1f9b9e..f2517ad1a89 100644 --- a/addons/web_kanban/i18n/pt_BR.po +++ b/addons/web_kanban/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po index 273f2dd9b78..6f8e3148220 100644 --- a/addons/web_kanban/i18n/ro.po +++ b/addons/web_kanban/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po index 5d973fa037e..6f01613bb0e 100644 --- a/addons/web_kanban/i18n/ru.po +++ b/addons/web_kanban/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po index 3c4d5bb3416..afb366273cf 100644 --- a/addons/web_kanban/i18n/sl.po +++ b/addons/web_kanban/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po index 7f6ade99d9f..4a68d785e22 100644 --- a/addons/web_kanban/i18n/sr@latin.po +++ b/addons/web_kanban/i18n/sr@latin.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po index dc5c58877f1..883e20e81b6 100644 --- a/addons/web_kanban/i18n/sv.po +++ b/addons/web_kanban/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po index bf9d7dcf3e2..a35b9ad33b7 100644 --- a/addons/web_kanban/i18n/th.po +++ b/addons/web_kanban/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po index 2bfd29f50ba..de3a48857ec 100644 --- a/addons/web_kanban/i18n/tr.po +++ b/addons/web_kanban/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po index 95180793a3d..ef16e07fe2e 100644 --- a/addons/web_kanban/i18n/zh_CN.po +++ b/addons/web_kanban/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po index bc91416e782..1eac8072d3a 100644 --- a/addons/web_kanban/i18n/zh_TW.po +++ b/addons/web_kanban/i18n/zh_TW.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_kanban diff --git a/addons/web_kanban/views/web_kanban.xml b/addons/web_kanban/views/web_kanban.xml new file mode 100644 index 00000000000..99245e857e2 --- /dev/null +++ b/addons/web_kanban/views/web_kanban.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_kanban assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_kanban/static/src/css/kanban.css"/> + + <script type="text/javascript" src="/web_kanban/static/src/js/kanban.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_kanban_gauge/__openerp__.py b/addons/web_kanban_gauge/__openerp__.py index 7eb2ba81dad..592f66b77b3 100644 --- a/addons/web_kanban_gauge/__openerp__.py +++ b/addons/web_kanban_gauge/__openerp__.py @@ -6,11 +6,8 @@ This widget allows to display gauges using justgage library. """, 'version': '1.0', 'depends': ['web_kanban'], - 'js': [ - 'static/lib/justgage/justgage.js', - 'static/src/js/kanban_gauge.js' - ], - 'css': [ + 'data' : [ + 'views/web_kanban_gauge.xml', ], 'qweb': [ ], diff --git a/addons/web_kanban_gauge/views/web_kanban_gauge.xml b/addons/web_kanban_gauge/views/web_kanban_gauge.xml new file mode 100644 index 00000000000..7500807a599 --- /dev/null +++ b/addons/web_kanban_gauge/views/web_kanban_gauge.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_kanban_gauge assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/web_kanban_gauge/static/lib/justgage/justgage.js"></script> + <script type="text/javascript" src="/web_kanban_gauge/static/src/js/kanban_gauge.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_kanban_sparkline/__openerp__.py b/addons/web_kanban_sparkline/__openerp__.py index 3fb4e13b4f7..eca0e283716 100644 --- a/addons/web_kanban_sparkline/__openerp__.py +++ b/addons/web_kanban_sparkline/__openerp__.py @@ -6,11 +6,8 @@ This widget allows to display sparklines using jquery.sparkline library. """, 'version': '1.0', 'depends': ['web_kanban'], - 'js': [ - "static/lib/jquery.sparkline/jquery.sparkline.js", - 'static/src/js/kanban_sparkline.js' - ], - 'css': [ + 'data' : [ + 'views/web_kanban_sparkline.xml', ], 'qweb': [ ], diff --git a/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml b/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml new file mode 100644 index 00000000000..0891ad2f88d --- /dev/null +++ b/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_kanban_sparkline assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/web_kanban_sparkline/static/lib/jquery.sparkline/jquery.sparkline.js"></script> + <script type="text/javascript" src="/web_kanban_sparkline/static/src/js/kanban_sparkline.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_tests/__init__.py b/addons/web_tests/__init__.py index 40a96afc6ff..8757cd322f3 100644 --- a/addons/web_tests/__init__.py +++ b/addons/web_tests/__init__.py @@ -1 +1,2 @@ # -*- coding: utf-8 -*- +import tests diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py index b34f96f78b2..894ddcdeb8c 100644 --- a/addons/web_tests/__openerp__.py +++ b/addons/web_tests/__openerp__.py @@ -7,8 +7,9 @@ OpenERP Web test suite. """, 'version': '2.0', - 'depends': [], - 'js': ['static/src/js/*.js'], - 'css': ['static/src/css/*.css'], + 'depends': ['web', 'web_kanban'], + 'data' : [ + 'views/web_tests.xml', + ], 'auto_install': True, } diff --git a/addons/web_tests_demo/tests/__init__.py b/addons/web_tests/tests/__init__.py index 1db9e399fd2..7879fd661db 100644 --- a/addons/web_tests_demo/tests/__init__.py +++ b/addons/web_tests/tests/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -import test_js +import test_ui diff --git a/addons/web/tests/test_ui.py b/addons/web_tests/tests/test_ui.py index 4bbc4a3954c..fd644341092 100644 --- a/addons/web/tests/test_ui.py +++ b/addons/web_tests/tests/test_ui.py @@ -11,6 +11,6 @@ class TestUi(openerp.tests.HttpCase): def test_03_js_public(self): self.phantom_js('/',"console.log('ok')","console") def test_04_js_admin(self): - self.phantom_js('/',"console.log('ok')","openerp.client.action_manager.inner_widget.views.form", login='admin') + self.phantom_js('/web',"console.log('ok')","openerp.client.action_manager.inner_widget.views.form", login='admin') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web/tests/test_ui_hello.js b/addons/web_tests/tests/test_ui_hello.js index 6a453e947aa..6a453e947aa 100644 --- a/addons/web/tests/test_ui_hello.js +++ b/addons/web_tests/tests/test_ui_hello.js diff --git a/addons/web/tests/test_ui_load.js b/addons/web_tests/tests/test_ui_load.js index 9d76250d239..9d76250d239 100644 --- a/addons/web/tests/test_ui_load.js +++ b/addons/web_tests/tests/test_ui_load.js diff --git a/addons/web_tests/views/web_tests.xml b/addons/web_tests/views/web_tests.xml new file mode 100644 index 00000000000..a2be583242c --- /dev/null +++ b/addons/web_tests/views/web_tests.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_tests assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_tests/static/src/css/web_tests.css"/> + + <script type="text/javascript" src="/web_tests/static/src/js/web_tests.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_tests_demo/__openerp__.py b/addons/web_tests_demo/__openerp__.py index 64b23790b9b..e753d2f5e5e 100644 --- a/addons/web_tests_demo/__openerp__.py +++ b/addons/web_tests_demo/__openerp__.py @@ -8,7 +8,8 @@ OpenERP Web demo of a test suite Test suite example, same code as that used in the testing documentation. """, 'depends': ['web'], - 'js': ['static/src/js/demo.js'], - 'test': ['static/test/demo.js'], + 'data' : [ + 'views/web_tests_demo.xml', + ], 'qweb': ['static/src/xml/demo.xml'], } diff --git a/addons/web_tests_demo/static/src/js/demo.js b/addons/web_tests_demo/static/src/js/demo.js index 506808027cc..9ac8d395784 100644 --- a/addons/web_tests_demo/static/src/js/demo.js +++ b/addons/web_tests_demo/static/src/js/demo.js @@ -1,11 +1,12 @@ // static/src/js/demo.js -openerp.web_tests_demo = function (instance) { - _.extend(instance.web_tests_demo, { +(function () { + openerp.web_tests_demo = { value_true: true, - SomeType: instance.web.Class.extend({ + SomeType: openerp.web.Class.extend({ init: function (value) { this.value = value; } }) - }); -}; + }; + +}()); diff --git a/addons/web_tests_demo/tests/test_js.py b/addons/web_tests_demo/tests/test_js.py deleted file mode 100644 index fb97176bad2..00000000000 --- a/addons/web_tests_demo/tests/test_js.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from openerp.addons.web.tests.test_js import WebSuite - -def load_tests(loader, standard_tests, _): - standard_tests.addTest(WebSuite('web_tests_demo')) - return standard_tests diff --git a/addons/web_tests_demo/views/web_tests_demo.xml b/addons/web_tests_demo/views/web_tests_demo.xml new file mode 100644 index 00000000000..75d5670484a --- /dev/null +++ b/addons/web_tests_demo/views/web_tests_demo.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_tests_demo assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/web_tests_demo/static/src/js/demo.js"></script> + </xpath> + </template> + <template id="qunit_suite" name="web_tests_demo qunit" inherit_id="web.qunit_suite"> + <xpath expr="//head" position="inside"> + <script type="text/javascript" src="/web_tests_demo/static/test/demo.js"></script> + </xpath> + </template> + </data> +</openerp> diff --git a/addons/web_view_editor/__openerp__.py b/addons/web_view_editor/__openerp__.py index 2ead0bb21fd..61a6a3b7373 100644 --- a/addons/web_view_editor/__openerp__.py +++ b/addons/web_view_editor/__openerp__.py @@ -8,8 +8,9 @@ OpenERP Web to edit views. """, 'version': '2.0', 'depends':['web'], - 'js': ['static/src/js/view_editor.js'], - 'css': ['static/src/css/view_editor.css'], + 'data' : [ + 'views/web_view_editor.xml', + ], 'qweb': ['static/src/xml/view_editor.xml'], 'auto_install': True, } diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po index 8e8dca017d9..9c60d61cd46 100644 --- a/addons/web_view_editor/i18n/ar.po +++ b/addons/web_view_editor/i18n/ar.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po index 3e09332804c..99a65a5e95b 100644 --- a/addons/web_view_editor/i18n/bs.po +++ b/addons/web_view_editor/i18n/bs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po index ffe140726ea..7542fb10dda 100644 --- a/addons/web_view_editor/i18n/cs.po +++ b/addons/web_view_editor/i18n/cs.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po index ca06002746b..e3bcc4a2bd1 100644 --- a/addons/web_view_editor/i18n/da.po +++ b/addons/web_view_editor/i18n/da.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po index e408677efb9..f04e05b7c1e 100644 --- a/addons/web_view_editor/i18n/de.po +++ b/addons/web_view_editor/i18n/de.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po index 7174c303ab3..d98347a8c43 100644 --- a/addons/web_view_editor/i18n/en_AU.po +++ b/addons/web_view_editor/i18n/en_AU.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po index 2e14ba16c2d..6a3bf0cf51f 100644 --- a/addons/web_view_editor/i18n/en_GB.po +++ b/addons/web_view_editor/i18n/en_GB.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po index 11c26cf4cdc..5ac14ec8644 100644 --- a/addons/web_view_editor/i18n/es.po +++ b/addons/web_view_editor/i18n/es.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po index f56e6d6aa3d..e43ee134026 100644 --- a/addons/web_view_editor/i18n/es_DO.po +++ b/addons/web_view_editor/i18n/es_DO.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po index 11fa92a946f..45492ddd920 100644 --- a/addons/web_view_editor/i18n/es_EC.po +++ b/addons/web_view_editor/i18n/es_EC.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po index 516002c82b9..f80cea88af0 100644 --- a/addons/web_view_editor/i18n/es_MX.po +++ b/addons/web_view_editor/i18n/es_MX.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po index 397489efb08..0bfa4b91b80 100644 --- a/addons/web_view_editor/i18n/et.po +++ b/addons/web_view_editor/i18n/et.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po index 17748d859b9..87645ba659e 100644 --- a/addons/web_view_editor/i18n/fa.po +++ b/addons/web_view_editor/i18n/fa.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po index 73225c6f22d..0fa2f1f67e5 100644 --- a/addons/web_view_editor/i18n/fi.po +++ b/addons/web_view_editor/i18n/fi.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po index 63dc2f6815a..f8b7d33475b 100644 --- a/addons/web_view_editor/i18n/fr.po +++ b/addons/web_view_editor/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/he.po b/addons/web_view_editor/i18n/he.po index 05e74bd8e94..d87e129aee7 100644 --- a/addons/web_view_editor/i18n/he.po +++ b/addons/web_view_editor/i18n/he.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po index 073dd9b230e..68c089a7179 100644 --- a/addons/web_view_editor/i18n/hr.po +++ b/addons/web_view_editor/i18n/hr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po index 9e39c89de4f..d8339843f4c 100644 --- a/addons/web_view_editor/i18n/hu.po +++ b/addons/web_view_editor/i18n/hu.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po index 4745b7e5412..dee044abd28 100644 --- a/addons/web_view_editor/i18n/it.po +++ b/addons/web_view_editor/i18n/it.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po index e3e295b2d4a..3a08ba4f8ce 100644 --- a/addons/web_view_editor/i18n/ko.po +++ b/addons/web_view_editor/i18n/ko.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po index b9c56cd89ca..7c3b73b0056 100644 --- a/addons/web_view_editor/i18n/lt.po +++ b/addons/web_view_editor/i18n/lt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po index 29ea62a8de1..102e24b94c4 100644 --- a/addons/web_view_editor/i18n/lv.po +++ b/addons/web_view_editor/i18n/lv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po index 72806f116f6..7340ba86783 100644 --- a/addons/web_view_editor/i18n/mk.po +++ b/addons/web_view_editor/i18n/mk.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po index bb93cd1e16f..70266086c50 100644 --- a/addons/web_view_editor/i18n/mn.po +++ b/addons/web_view_editor/i18n/mn.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po index f2ae42c3e53..9eb8246040f 100644 --- a/addons/web_view_editor/i18n/nb.po +++ b/addons/web_view_editor/i18n/nb.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po index 3bfc88fb21c..5cbbea58a7c 100644 --- a/addons/web_view_editor/i18n/nl.po +++ b/addons/web_view_editor/i18n/nl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po index d13f3ce1573..720a7373037 100644 --- a/addons/web_view_editor/i18n/nl_BE.po +++ b/addons/web_view_editor/i18n/nl_BE.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po index 45d8d02a293..4cab5dab6e0 100644 --- a/addons/web_view_editor/i18n/pl.po +++ b/addons/web_view_editor/i18n/pl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po index 75aeba0238f..7a19de4dd8a 100644 --- a/addons/web_view_editor/i18n/pt.po +++ b/addons/web_view_editor/i18n/pt.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po index 96936096eef..66ab595026f 100644 --- a/addons/web_view_editor/i18n/pt_BR.po +++ b/addons/web_view_editor/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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po index b7e04c49bbd..d4b8dfe7897 100644 --- a/addons/web_view_editor/i18n/ro.po +++ b/addons/web_view_editor/i18n/ro.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po index 302612c7894..dab19d4c1eb 100644 --- a/addons/web_view_editor/i18n/ru.po +++ b/addons/web_view_editor/i18n/ru.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po index 0fa279da283..ec4646a13dd 100644 --- a/addons/web_view_editor/i18n/sl.po +++ b/addons/web_view_editor/i18n/sl.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po index a74b74a66cc..3ff53204945 100644 --- a/addons/web_view_editor/i18n/sv.po +++ b/addons/web_view_editor/i18n/sv.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po index e5572457cc2..0e01e01b71a 100644 --- a/addons/web_view_editor/i18n/th.po +++ b/addons/web_view_editor/i18n/th.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po index 08f58c571ec..766d4fccf45 100644 --- a/addons/web_view_editor/i18n/tr.po +++ b/addons/web_view_editor/i18n/tr.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po index 2d11a226e0f..405d7e148ec 100644 --- a/addons/web_view_editor/i18n/zh_CN.po +++ b/addons/web_view_editor/i18n/zh_CN.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: 2014-04-18 06:41+0000\n" +"X-Launchpad-Export-Date: 2014-04-26 06:55+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: web_view_editor diff --git a/addons/web_view_editor/views/web_view_editor.xml b/addons/web_view_editor/views/web_view_editor.xml new file mode 100644 index 00000000000..2f10163b0b4 --- /dev/null +++ b/addons/web_view_editor/views/web_view_editor.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- vim:fdn=3: +--> +<openerp> + <data> + <template id="assets_backend" name="web_view_editor assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/web_view_editor/static/src/css/view_editor.css"/> + + <script type="text/javascript" src="/web_view_editor/static/src/js/view_editor.js"></script> + </xpath> + </template> + </data> +</openerp> |