From d00d092e18a151ec42d7a16ea4015604ac8f7ab8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Apr 2014 15:17:30 +0200
Subject: [PATCH] [FIX] bootstrap - jquery.ui conflicts

bzr revid: fme@openerp.com-20140430131730-du7hem15of8spau1
---
 addons/web/views/webclient_templates.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index db7383cdb22..2c3a16ac13f 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -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 -->