From 09397684b31dc0fed57e4f7a1b172e72c1766aeb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 16:34:51 +0100
Subject: [PATCH] [FIX] website: change odrer of script tag because
 jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in
 edit mode

bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index e2878c27dce..5649ded4d4d 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -69,7 +69,6 @@
             <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
             <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
-            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
             <script type="text/javascript">
                 // Bootstrap and jQuery UI conflicts
                 $.fn.bstooltip = $.fn.tooltip;
@@ -80,6 +79,8 @@
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 
             <script type="text/javascript" src="/website/static/src/js/website.js"></script>
+            
+            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
             <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
 
             <t t-raw="head or ''" name='layout_head'/>
@@ -249,7 +250,7 @@
             </div>
         </div>
     </xpath>
-    <xpath expr='//t[@name="layout_head"]' position="before">
+    <xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
         <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
@@ -264,7 +265,6 @@
         <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.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>
-        <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
         <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <!-- 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>