pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_links duplicate assets

Browse Source 
- move momentjs to common
- define assets of website_links in one template
This commit is contained in:
Antony Lesuisse
2014-12-19 19:49:14 +01:00
parent 5e8b6934d1
commit 33f7322c0f
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/views/webclient_templates.xml
+1 -1
View File
@@ -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 -->
addons/website_links/views/website_links_graphs.xml
+3 -12
View File
@@ -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>
</odoo>
addons/website_links/views/website_links_template.xml
+6 -6
View File
@@ -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>