diff options
| author | Prashant Panchal (OpenERP) <ppa@tinyerp.com> | 2014-05-07 15:15:07 +0530 |
|---|---|---|
| committer | Prashant Panchal (OpenERP) <ppa@tinyerp.com> | 2014-05-07 15:15:07 +0530 |
| commit | 3bdba0b4993bcfecf7482df557bdd67dbb9ee0b8 (patch) | |
| tree | 5f353e622a3a81b629b6835ee29cb5895b191c4c /addons/website | |
| parent | e511de45cbe46f5f93358aa23d405588ed485cac (diff) | |
| parent | 93bab6ba7a3cc3aa0cab8679e38fc3a7e930bf1a (diff) | |
[MERGE]merge with trunk
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/views/website_templates.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 89a0885d417..8d46a09f2fb 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -276,7 +276,9 @@ <script type="text/javascript" src="/website/static/lib/ace/theme-monokai.js"></script> <script type="text/javascript" src="/website/static/lib/ace/mode-xml.js"></script> <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script> - <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> <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) --> <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script> <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script> |