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

Merge pull request #95 from odoo-dev/master-seperate-bundle-fme

Browse Source 
Seperate web.assets_common from other bundles
This commit is contained in:
Fabien Meghazi
2014-05-21 10:40:33 +02:00
parent a756b82372 593cdf427f
commit d5fcc1e1e0
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/controllers/main.py
+1
View File
@@ -36,6 +36,7 @@ html_template = """<!DOCTYPE html>
<link rel="stylesheet" href="/point_of_sale/static/src/fonts/font-awesome-4.0.3/css/font-awesome.min.css" />
<link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" />
<link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css" />
<script type="text/javascript" src="/web/js/web.assets_common"></script>
<script type="text/javascript" src="/web/js/web.assets_backend"></script>
<script type="text/javascript">
$(function() {
addons/stock/controllers/main.py
+1
View File
@@ -26,6 +26,7 @@ html_template = """<!DOCTYPE html>
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
<script type="text/javascript" src="/web/js/web.assets_common"></script>
<script type="text/javascript" src="/web/js/web.assets_backend"></script>
<script type="text/javascript">
$(function() {
addons/web/views/webclient_templates.xml
+2 -1
View File
@@ -43,7 +43,6 @@
</template>
<template id="web.assets_backend">
<t t-call="web.assets_common"/>
<!-- Datejs -->
<script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
@@ -137,6 +136,7 @@
<template id="web.webclient_bootstrap" name="Webclient Bootstrap">
<t t-call="web.layout">
<t t-set="head">
<t t-call-assets="web.assets_common"/>
<t t-call-assets="web.assets_backend"/>
<script type="text/javascript">
$(function() {
@@ -242,6 +242,7 @@
<link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"/>
<script src="/web/static/lib/qunit/qunit.js"></script>
<t t-call="web.assets_common"/>
<t t-call="web.assets_backend"/>
<script type="text/javascript" id="qunit_config">
addons/website/views/website_templates.xml
+1 -1
View File
@@ -12,7 +12,6 @@
</template>
<template id="website.assets_frontend" name="Website assets">
<t t-call="web.assets_common"/>
<t t-call="website.theme"/>
<script type="text/javascript" src="/web/static/src/js/watch.js"></script>
@@ -89,6 +88,7 @@
</t>
</t>
<t t-call-assets="web.assets_common"/>
<t t-call-assets="website.assets_frontend"/>
<t t-raw="head or ''" name='layout_head'/>