diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-02-24 12:03:49 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-02-24 13:47:06 +0100 |
| commit | 88c2b6843a09ba087a10388fc39cb69dac4e2949 (patch) | |
| tree | 03dad165167f938f8d668579cc57c42822497e85 /addons/theme_default | |
| parent | 5b65befcd889139152c590490fb8965c9f4b5279 (diff) | |
[REF] web,web_editor,website(_*),report,pos,mass_mailing: assets
* Remove recursive assets inclusions (i.e. assets_editor was including
assets_common, summernote, ...)
* Better construct the assets (link, then script + type attribute)
* Better include the assets (split js / css, always use t-call-assets)
* Simplifies the number of assets
* Move bootstrap js to assets common
* assets_frontend is now created by web module to allow using it on the
connexion page but also in the web_editor, where colors have to be
bootstrap/theme ones. Note: if a module depends on website, then keep
using the inherit_id="WEBSITE.assets_frontend"
Diffstat (limited to 'addons/theme_default')
| -rw-r--r-- | addons/theme_default/views/templates.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/theme_default/views/templates.xml b/addons/theme_default/views/templates.xml index b1866c81844..e9ed1f62d6b 100644 --- a/addons/theme_default/views/templates.xml +++ b/addons/theme_default/views/templates.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp> -<data> +<odoo> +<template id="assets_frontend" inherit_id="website.assets_frontend" name="Theme Default Assets Frontend"> + <xpath expr="link[last()]" position="after"> + <link rel="stylesheet" href="/theme_default/static/src/less/customize_modal.less"/> + </xpath> +</template> <template id="customize_modal" inherit_id="website.theme_customize" name="treehouse Customize Modal" priority="1"> <xpath expr="div" position="replace"> @@ -165,6 +169,4 @@ <link href="/theme_default/static/src/less/option_font.less" rel="stylesheet" type="text/less"/> </xpath> </template> - -</data> -</openerp> +</odoo> |