diff options
| author | qsm-odoo <qsm@odoo.com> | 2019-08-27 14:47:47 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-08-28 09:04:55 +0000 |
| commit | 4f27e52cabb77b8b1a9637a11185ddf882adc9af (patch) | |
| tree | b4b752daef0050988604260d43802413c856bbd7 /addons/web_editor/views/editor.xml | |
| parent | 05f9b1f4e680ef05fccf2b9b324ec24282daa65d (diff) | |
[IMP] web_editor, *: introduce and restore new web_editor UI
* mass_mailing, note, website, website_blog, website_form,
website_mass_mailing, website_sale
This commit, unfortunately, mixes three things:
- Restoring as much as possible the scss organisation to allow styling
the web_editor UI properly.
- Fixing some bugs like a border around the page once the editor is
loaded, no ability to scroll the snippets, etc
- Introducing a whole new UI for snippet options: a left panel instead
of the old dropdown & button overlay.
Note: this commit also do some linting and ES6 convertion even though
some of it has been done in the parent commit.
Note 2: some elements that were removed are still styled in the POS apps
but this is because part of a feature was removed while leaving dead
code behind, this is handled in another PR which is to be merged
(https://github.com/odoo/odoo/pull/36136).
Part of https://github.com/odoo/odoo/pull/36068
task-1942370
closes odoo/odoo#36068
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web_editor/views/editor.xml')
| -rw-r--r-- | addons/web_editor/views/editor.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml index c16aca1485a..484ca4994c4 100644 --- a/addons/web_editor/views/editor.xml +++ b/addons/web_editor/views/editor.xml @@ -19,6 +19,7 @@ <link rel="stylesheet" type="text/css" href="/web_editor/static/lib/cropper/css/cropper.css"/> <script type="text/javascript" src="/web_editor/static/lib/cropper/js/cropper.js"/> <script type="text/javascript" src="/web_editor/static/lib/jQuery.transfo.js"/> + <script type="text/javascript" src="/web_editor/static/lib/nearest/jquery.nearest.js"/> <!-- odoo utils --> @@ -30,11 +31,9 @@ <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg.scss"/> <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg_iframe.scss"/> - <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg_snippets.scss"/> <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/fonts.js"/> - <script type="text/javascript" src="/web_editor/static/lib/nearest/jquery.nearest.js"/> <script type="text/javascript" src="/web_editor/static/src/js/base.js"/> <script type="text/javascript" src="/web_editor/static/src/js/editor/editor.js"/> <script type="text/javascript" src="/web_editor/static/src/js/editor/rte.js"/> |