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/mass_mailing/views/editor_field_html.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/mass_mailing/views/editor_field_html.xml')
| -rw-r--r-- | addons/mass_mailing/views/editor_field_html.xml | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/addons/mass_mailing/views/editor_field_html.xml b/addons/mass_mailing/views/editor_field_html.xml index 11224aa4fbb..77244586669 100644 --- a/addons/mass_mailing/views/editor_field_html.xml +++ b/addons/mass_mailing/views/editor_field_html.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> +<odoo> +<template id="assets_editor" inherit_id="web_editor.assets_editor"> + <xpath expr="link[last()]" position="after"> + <link rel="stylesheet" type="text/less" href="/mass_mailing/static/src/less/mass_mailing_editor.less"/> + </xpath> +</template> <!-- Template Choice page --> <template id="FieldTextHtmlInline" name="Editor layout"> - <t t-set="head"> <t t-if="enable_editor"> - <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor.css" type="text/css"/> <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor_thumb.css" type="text/css"/> <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing_editor.js"></script> </t> @@ -23,10 +25,9 @@ </t> <t t-call="web_editor.layout"> - <div> - <div t-if="not edit_translations" id="editable_area" class="o_editable" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html"><t t-raw="content"/></div> - <div t-if="edit_translations" id="editable_area"><t t-raw="content"/></div> - </div> + <div t-if="not edit_translations" id="editable_area" class="o_editable" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html"><t t-raw="content"/></div> + <div t-if="edit_translations" id="editable_area"><t t-raw="content"/></div> + <div id="templates" class="o_not_editable o_css_editor hidden" t-if="enable_editor"> <h1 class="page-header mt16 email_head panel-primary"> Select a theme @@ -51,13 +52,11 @@ </div> </div> </div> - </t> </template> <template id="FieldTextHtmlPopupContent" name="Editor layout"> <t t-set="head"> - <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor.css" type="text/css"/> <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor_thumb.css" type="text/css"/> <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_popup.css" type="text/css"/> </t> @@ -77,7 +76,4 @@ </div> </t> </template> - - </data> -</openerp> - +</odoo> |