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/web_editor/views/iframe.xml | |
| 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/web_editor/views/iframe.xml')
| -rw-r--r-- | addons/web_editor/views/iframe.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/addons/web_editor/views/iframe.xml b/addons/web_editor/views/iframe.xml index 43a2861ca78..0bd2bbcf789 100644 --- a/addons/web_editor/views/iframe.xml +++ b/addons/web_editor/views/iframe.xml @@ -15,21 +15,20 @@ var snippets_url = '<t t-esc="snippets or ''"/>'; var callback = window.location.href.match(/callback=([^&=]+)/)[1]; </script> - <link t-if="enable_editor and inline_mode" rel="stylesheet" href="/web_editor/static/src/css/web_editor.iframe.inline.css" type="text/css"/> <t t-if="not dont_load_assets"> - <t t-call-assets="web_editor.assets_editor"/> - <style> - .note-popover .popover { left: 5px !important; } - html[data-translatable] .note-popover .popover { left: 150px !important; } - </style> + <t t-call-assets="web.assets_common" t-js="false"/> + <t t-call-assets="web.assets_frontend" t-js="false"/> + <t t-call-assets="web_editor.summernote" t-js="false"/> + <t t-call-assets="web_editor.assets_editor" t-js="false"/> + + <t t-call-assets="web.assets_common" t-css="false"/> + <t t-call-assets="web_editor.summernote" t-css="false"/> + <t t-call-assets="web_editor.assets_editor" t-css="false"/> + <script type="text/javascript" src="/web/static/src/js/framework/session_instance.js"></script> <script type="text/javascript" src="/web_editor/static/src/js/iframe.js"></script> <script t-if="enable_editor and inline_mode" type="text/javascript" src="/web_editor/static/src/js/inline.js"></script> </t> - <script type="text/javascript"> - var snippets_url = '<t t-esc="snippets or ''"/>'; - var callback = window.location.href.match(/callback=([^&=]+)/)[1]; - </script> <script> if (window.top.odoo && !window.top.odoo[callback+"_updown"]) { window.top.odoo[callback+"_updown"] = function (value, fields_values) { |