[FIX] jQuery.ui - boostrap conflict
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
This commit is contained in:
parent
b393c4ac18
commit
ee1fbd17c8
|
@ -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/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/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="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.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>
|
<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) -->
|
<!-- 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//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
|
||||||
<script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
|
<script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
|
||||||
|
|
|
@ -95,7 +95,9 @@
|
||||||
<template id="products" name="Products">
|
<template id="products" name="Products">
|
||||||
<t t-call="website.layout">
|
<t t-call="website.layout">
|
||||||
<t t-set="head">
|
<t t-set="head">
|
||||||
|
<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>
|
<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/css/smoothness/jquery-ui-1.9.1.custom.css"/>
|
<link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
|
||||||
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
|
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
|
||||||
|
|
Loading…
Reference in New Issue