From 33f7322c0f3ffcd577f1b5a1aa8565a18f205342 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 19 Dec 2014 18:52:29 +0100
Subject: [PATCH] [FIX] website_links duplicate assets

- move momentjs to common
- define assets of website_links in one template
---
 addons/web/views/webclient_templates.xml          |  2 +-
 .../website_links/views/website_links_graphs.xml  | 15 +++------------
 .../views/website_links_template.xml              | 12 ++++++------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 63d58fcdae7..514e4b85882 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -8,6 +8,7 @@
             <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/spinjs/spin.js"></script>
+            <script type="text/javascript" src="/web/static/lib/moment/moment.js"></script>
 
             <!-- jQuery stuff -->
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
@@ -61,7 +62,6 @@
 
             <!-- Datetime Picker -->
             <link rel="stylesheet" href="/web/static/lib/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css"/>
-            <script type="text/javascript" src="/web/static/lib/moment/moment.js"></script>
             <script type="text/javascript" src="/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js"></script>
 
             <!-- jQuery ui -->
diff --git a/addons/website_links/views/website_links_graphs.xml b/addons/website_links/views/website_links_graphs.xml
index 4c71baf669e..710f3499e50 100644
--- a/addons/website_links/views/website_links_graphs.xml
+++ b/addons/website_links/views/website_links_graphs.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <template id="assets_website_links_charts" inherit_id="website.assets_frontend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web/static/lib/moment/moment.js"/>
-                <script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>
-                <script type="text/javascript" src="/website_links/static/src/js/ZeroClipboard.js"/>
-                <link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css" />
-            </xpath>
-        </template>
+<odoo>
 
         <template id="assets_nvd3">
             <link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
@@ -175,5 +166,5 @@
                 </div>
             </t>
         </template>
-    </data>
-</openerp>
\ No newline at end of file
+
+</odoo>
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index b7f5930eeb0..2656ab9f93b 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
+
         <template id="assets_website_links" inherit_id="website.assets_frontend">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
                 <script type="text/javascript" src="/website_links/static/lib/zeroclipboard/ZeroClipboard.js"/>
-                <link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css" />
+                <script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
                 <script type="text/javascript" src="/website_links/static/src/js/website_links_code_editor.js"/>
+                <script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>
+                <link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css" />
             </xpath>
         </template>
 
@@ -118,6 +119,5 @@
                 <t t-call="website_links.create_shorten_url"/>
             </t>
         </template>
-    </data>
-</openerp>
 
+</odoo>