odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] bootstrap - jquery.ui conflicts 

bzr revid: fme@openerp.com-20140430131730-du7hem15of8spau1
This commit is contained in:
Fabien Meghazi 2014-04-30 15:17:30 +02:00
parent f0bdc2f9f4
commit d00d092e18
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/views/webclient_templates.xml
View File

@ -18,13 +18,9 @@
<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>
<!-- Obsolete ??? -->
<script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<!-- Bootstrap -->
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css"/>
<script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
</template>
<template id="web.assets_backend">
@ -60,6 +56,8 @@
<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 -->