[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20140508125444-7d1m7qk7bi2hrbmv
This commit is contained in:
Vidhin Mehta (OpenERP) 2014-05-08 18:24:44 +05:30
commit 9967c9e19c
351 changed files with 865 additions and 849 deletions

View File

@ -497,50 +497,6 @@ def content_disposition(filename):
#----------------------------------------------------------
# OpenERP Web web Controllers
#----------------------------------------------------------
# TODO: to remove once the database manager has been migrated server side
# and `edi` + `pos` addons has been adapted to use render_bootstrap_template()
html_template = """<!DOCTYPE html>
<html style="height: 100%%">
<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</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">
$(function() {
var s = new openerp.init(%(modules)s);
%(init)s
});
</script>
</head>
<body>
<!--[if lte IE 8]>
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script>CFInstall.check({mode: "overlay"});</script>
<![endif]-->
</body>
</html>
"""
def render_bootstrap_template(template, values=None, **kw):
if values is None:
values = dict()
try:
values['databases'] = http.db_list()
except openerp.exceptions.AccessDenied:
values['databases'] = None
if 'modules' not in values:
values['modules'] = module_boot()
values['modules'] = simplejson.dumps(values['modules'])
return request.render(template, values, **kw)
class Home(http.Controller):
@http.route('/', type='http', auth="none")
@ -554,12 +510,7 @@ class Home(http.Controller):
if request.session.uid:
if kw.get('redirect'):
return werkzeug.utils.redirect(kw.get('redirect'), 303)
headers = {
'Cache-Control': 'no-cache',
'Content-Type': 'text/html; charset=utf-8',
}
return render_bootstrap_template("web.webclient_bootstrap", headers=headers)
return request.render('web.webclient_bootstrap')
else:
return login_redirect()
@ -577,6 +528,12 @@ class Home(http.Controller):
if not redirect:
redirect = '/web?' + request.httprequest.query_string
values['redirect'] = redirect
try:
values['databases'] = http.db_list()
except openerp.exceptions.AccessDenied:
values['databases'] = None
if request.httprequest.method == 'POST':
old_uid = request.uid
uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password'])
@ -584,7 +541,7 @@ class Home(http.Controller):
return http.redirect_with_hash(redirect)
request.uid = old_uid
values['error'] = "Wrong login/password"
return render_bootstrap_template('web.login', values)
return request.render('web.login', values)
@http.route('/login', type='http', auth="none")
def login(self, db, login, key, redirect="/web", **kw):
@ -745,75 +702,9 @@ class Database(http.Controller):
def manager(self, **kw):
# TODO: migrate the webclient's database manager to server side views
request.session.logout()
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,
'css': css,
return env.get_template("database_manager.html").render({
'modules': simplejson.dumps(module_boot()),
'init': """
var wc = new s.web.WebClient(null, { action: 'database_manager' });
wc.appendTo($(document.body));
"""
}
return r
})
@http.route('/web/database/get_list', type='json', auth="none")
def get_list(self):

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:31+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:31+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:31+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
"X-Poedit-Language: Czech\n"
#. module: web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
"Language: es\n"
#. module: web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:31+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web
@ -68,14 +68,14 @@ msgstr "기존 암호를 입력해 주세요."
#: code:addons/web/static/src/xml/base.xml:300
#, python-format
msgid "Master password:"
msgstr "마스터 암호:"
msgstr "마스터 비밀번호"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:292
#, python-format
msgid "Change Master Password"
msgstr "마스터 암호 변경"
msgstr "마스터 비밀번호 변경하기"
#. module: web
#. openerp-web
@ -110,7 +110,7 @@ msgstr "업로드 오류"
#: code:addons/web/static/src/js/coresetup.js:593
#, python-format
msgid "about an hour ago"
msgstr "약 시간 전"
msgstr "약 1시간 전"
#. module: web
#. openerp-web
@ -161,14 +161,14 @@ msgstr "파일"
#: code:addons/web/controllers/main.py:869
#, python-format
msgid "You cannot leave any password empty."
msgstr "호는 비워둘 수 없습니다."
msgstr "비밀번호는 비워둘 수 없습니다."
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/chrome.js:732
#, python-format
msgid "Invalid username or password"
msgstr "유효하지 않은 사용자명 또는 호"
msgstr "유효하지 않은 사용자명 또는 비밀번호"
#. module: web
#. openerp-web
@ -177,7 +177,7 @@ msgstr "유효하지 않은 사용자명 또는 암호"
#: code:addons/web/static/src/xml/base.xml:278
#, python-format
msgid "Master Password:"
msgstr "마스터 암호:"
msgstr "마스터 비밀번호"
#. module: web
#. openerp-web
@ -185,7 +185,7 @@ msgstr "마스터 암호:"
#: code:addons/web/static/src/xml/base.xml:1402
#, python-format
msgid "Select"
msgstr "선택"
msgstr "선택하기"
#. module: web
#. openerp-web
@ -235,7 +235,7 @@ msgstr "모든 사용자들과 공유"
#: code:addons/web/static/src/js/view_form.js:320
#, python-format
msgid "Form"
msgstr "양식"
msgstr ""
#. module: web
#. openerp-web
@ -263,7 +263,7 @@ msgstr "유효한 숫자가 아님"
#: code:addons/web/static/src/xml/base.xml:343
#, python-format
msgid "New Password:"
msgstr "새로운 비밀번호"
msgstr "새 비밀번호:"
#. module: web
#. openerp-web
@ -348,7 +348,7 @@ msgstr "중복 데이터베이스"
#: code:addons/web/static/src/xml/base.xml:354
#, python-format
msgid "Change Password"
msgstr "암호 변경"
msgstr "비밀번호 변경하기"
#. module: web
#. openerp-web
@ -1601,7 +1601,7 @@ msgstr "데이터 베이스 삭제"
#: code:addons/web/static/src/xml/base.xml:467
#, python-format
msgid "Powered by"
msgstr ""
msgstr "Powered by"
#. module: web
#. openerp-web
@ -1644,7 +1644,7 @@ msgstr "--- 가져오지 않기 ---"
#: code:addons/web/static/src/xml/base.xml:1697
#, python-format
msgid "Import-Compatible Export"
msgstr ""
msgstr "가져오기-호환 파일 내보내기"
#. module: web
#. openerp-web
@ -2364,7 +2364,7 @@ msgstr "o2m 기록은 액션을 사용하기 전에 저장되어야 합니다."
#: code:addons/web/static/src/js/chrome.js:531
#, python-format
msgid "Backed"
msgstr ""
msgstr "백업됨"
#. module: web
#. openerp-web
@ -2420,7 +2420,7 @@ msgstr "ID:"
#: code:addons/web/static/src/xml/base.xml:892
#, python-format
msgid "Only you"
msgstr ""
msgstr "Only you"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:32+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:33+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:52+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:31+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web
@ -2593,7 +2593,7 @@ msgstr "สร้างฐานข้อมูล"
#: code:addons/web/static/src/xml/base.xml:442
#, python-format
msgid "GNU Affero General Public License"
msgstr ""
msgstr "GNU Affero General Public License"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:53+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:34+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web
#. openerp-web

View File

@ -29,7 +29,7 @@
<div t-if="testing || true" t-att-class="novar || 'yes'" style="display: none">
<t t-set="novar"></t>
<t t-set="style">height: 200px; border: 1px solid red;</t>
<div t-att="{ 'style' : style, 'disabled' : 'false', 'readonly' : novar or undefined }" t-opentag="true"/>
<div t-att="{ 'style' : style, 'disabled' : 'false', 'readonly' : novar or undefined }"/>
<t t-foreach="{'my': 'first', 'my2': 'second' }" t-as="v">
* <t t-esc="v"/> : <t t-esc="v_value"/>
</t>

View File

@ -37,6 +37,7 @@ var QWeb2 = {
'lt': '<',
'lte': '<='
},
VOID_ELEMENTS: 'area,base,br,col,embed,hr,img,input,keygen,link,menuitem,meta,param,source,track,wbr'.split(','),
tools: {
exception: function(message, context) {
context = context || {};
@ -218,6 +219,7 @@ QWeb2.Engine = (function() {
this.jQuery = window.jQuery;
this.reserved_words = QWeb2.RESERVED_WORDS.slice(0);
this.actions_precedence = QWeb2.ACTIONS_PRECEDENCE.slice(0);
this.void_elements = QWeb2.VOID_ELEMENTS.slice(0);
this.word_replacement = QWeb2.tools.extend({}, QWeb2.WORD_REPLACEMENT);
this.preprocess_node = null;
for (var i = 0; i < arguments.length; i++) {
@ -480,6 +482,7 @@ QWeb2.Element = (function() {
this._bottom = [];
this._indent = 1;
this.process_children = true;
this.is_void_element = ~QWeb2.tools.arrayIndexOf(this.engine.void_elements, this.tag);
var childs = this.node.childNodes;
if (childs) {
for (var i = 0, ilen = childs.length; i < ilen; i++) {
@ -677,11 +680,13 @@ QWeb2.Element = (function() {
this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.string_interpolation(v)) + ")]));");
}
}
if (this.children.length || this.actions.opentag === 'true') {
if (this.actions.opentag === 'true' || (!this.children.length && this.is_void_element)) {
// We do not enforce empty content on void elements
// because QWeb rendering is not necessarily html.
this.top_string("/>");
} else {
this.top_string(">");
this.bottom_string("</" + this.tag + ">");
} else {
this.top_string("/>");
}
}
},

View File

@ -345,31 +345,16 @@ instance.web.Session.include( /** @lends instance.web.Session# */{
load_css: function (files) {
var self = this;
_.each(files, function (file) {
$('head').append($('<link>', {
'href': self.url(file, null),
'rel': 'stylesheet',
'type': 'text/css'
}));
openerp.loadCSS(self.url(file, null));
});
},
load_js: function(files) {
var self = this;
var d = $.Deferred();
if(files.length !== 0) {
if (files.length !== 0) {
var file = files.shift();
var tag = document.createElement('script');
tag.type = 'text/javascript';
tag.src = self.url(file, null);
tag.onload = tag.onreadystatechange = function() {
if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
return;
tag.onload_done = true;
self.load_js(files).done(function () {
d.resolve();
});
};
var head = document.head || document.getElementsByTagName('head')[0];
head.appendChild(tag);
var url = self.url(file, null);
openerp.loadJS(url).done(d.resolve);
} else {
d.resolve();
}

View File

@ -933,6 +933,46 @@ openerp.jsonpRpc = function(url, fct_name, params, settings) {
});
};
openerp.loadCSS = function (url) {
if (!$('link[href="' + url + '"]').length) {
$('head').append($('<link>', {
'href': url,
'rel': 'stylesheet',
'type': 'text/css'
}));
}
};
openerp.loadJS = function (url) {
var def = $.Deferred();
if ($('script[src="' + url + '"]').length) {
def.resolve();
} else {
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = url;
script.onload = script.onreadystatechange = function() {
if ((script.readyState && script.readyState != "loaded" && script.readyState != "complete") || script.onload_done) {
return;
}
script.onload_done = true;
def.resolve(url);
};
script.onerror = function () {
console.error("Error loading file", script.src);
def.reject(url);
};
var head = document.head || document.getElementsByTagName('head')[0];
head.appendChild(script);
}
return def;
};
openerp.loadBundle = function (name) {
return $.when(
openerp.loadCSS('/web/css/' + name),
openerp.loadJS('/web/js/' + name)
);
};
var realSetTimeout = function(fct, millis) {
var finished = new Date().getTime() + millis;
var wait = function() {

View File

@ -451,6 +451,9 @@ instance.web.ActionManager = instance.web.Widget.extend({
ir_actions_client: function (action, options) {
var self = this;
var ClientWidget = instance.web.client_actions.get_object(action.tag);
if (!ClientWidget) {
return self.do_warn("Action Error", "Could not find client action '" + action.tag + "'.");
}
if (!(ClientWidget.prototype instanceof instance.web.Widget)) {
var next;

View File

@ -496,7 +496,7 @@
</h2>
</td>
<td colspan="2">
<div class="oe_view_manager_view_search" t-opentag="true"/>
<div class="oe_view_manager_view_search"/>
</td>
</tr>
<tr class="oe_header_row">

View File

@ -0,0 +1,79 @@
<!DOCTYPE html>
<html style="height: 100%">
<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</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" />
<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>
<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"/>
<script type="text/javascript">
$(function() {
var s = new openerp.init({{ modules|safe }});
var wc = new s.web.WebClient(null, { action: 'database_manager' });
wc.appendTo($(document.body));
});
</script>
</head>
<body>
<!--[if lte IE 8]>
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script>CFInstall.check({mode: "overlay"});</script>
<![endif]-->
</body>
</html>

View File

@ -23,6 +23,17 @@
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
</template>
<template id="jqueryui_conflict" name="jquery.ui.conflict">
<!-- TODO: get rid of this hack once jQuery.ui is removed -->
<script type="text/javascript" charset="utf-8">
$.fn.bstooltip = $.fn.tooltip;
</script>
<t t-raw="0"/>
<script type="text/javascript" charset="utf-8">
$.fn.tooltip = $.fn.bstooltip;
</script>
</template>
<template id="web.assets_backend">
<t t-call="web.assets_common"/>
<!-- Datejs -->
@ -45,10 +56,15 @@
<link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
<script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css"/>
<script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.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>
<t t-call="web.jqueryui_conflict">
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
</t>
<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>
@ -56,9 +72,6 @@
<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>

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
"X-Poedit-Language: Czech\n"
#. module: web_calendar

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
"Language: es\n"
#. module: web_calendar

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-04-26 06:54+0000\n"
"X-Generator: Launchpad (build 16985)\n"
"X-Launchpad-Export-Date: 2014-05-06 06:35+0000\n"
"X-Generator: Launchpad (build 16996)\n"
#. module: web_calendar
#. openerp-web

Some files were not shown because too many files have changed in this diff Show More