diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
| commit | c8cc54559b75a621e4444ecdca6abd901b45e494 (patch) | |
| tree | 92141325d4dbbf70bbfb8e0c040d4435c8d2378f /addons/mass_mailing/static/src | |
| parent | b2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (diff) | |
| parent | 91a14488250bc2bb405cc6d300359aa272642484 (diff) | |
[MERGE] forward port branch 10.0 up to 91a1448
Diffstat (limited to 'addons/mass_mailing/static/src')
68 files changed, 159 insertions, 606 deletions
diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg Binary files differdeleted file mode 100755 index 59e90bc0046..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg Binary files differdeleted file mode 100755 index 2af23b4f136..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg Binary files differdeleted file mode 100755 index f3003107735..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg Binary files differdeleted file mode 100755 index 85c6795bc0a..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg Binary files differdeleted file mode 100755 index 46ac685df6c..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg Binary files differdeleted file mode 100755 index ba47973b427..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg Binary files differdeleted file mode 100755 index c1e48ec82ae..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg Binary files differdeleted file mode 100755 index adf7686eaa9..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg Binary files differdeleted file mode 100755 index 2b76274d3df..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg Binary files differdeleted file mode 100755 index c3c644ceacc..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png Binary files differdeleted file mode 100755 index 1396468359d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png Binary files differdeleted file mode 100755 index 0546e634929..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png Binary files differdeleted file mode 100755 index 7101775ff34..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png Binary files differdeleted file mode 100755 index 221540bf7f4..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png Binary files differindex d93ecd63550..d93ecd63550 100755..100644 --- a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png +++ b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png Binary files differindex 157ab85588c..157ab85588c 100755..100644 --- a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png +++ b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png Binary files differindex 5c85179781b..5c85179781b 100755..100644 --- a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png +++ b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png Binary files differdeleted file mode 100755 index 0b2c469aa9f..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png Binary files differdeleted file mode 100755 index 60b3d2fcb9d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png Binary files differdeleted file mode 100755 index 1cc74a20574..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png Binary files differdeleted file mode 100755 index 4b5f3d01781..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png Binary files differdeleted file mode 100755 index 9e45931bbdc..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png Binary files differdeleted file mode 100755 index 68c0f3495b2..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png Binary files differdeleted file mode 100755 index dc992cd423e..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png Binary files differdeleted file mode 100755 index 2bcf3a62349..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png Binary files differdeleted file mode 100755 index 0d189dd2299..00000000000 --- a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg Binary files differdeleted file mode 100755 index 8f837a55b19..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg Binary files differdeleted file mode 100755 index 0b11910b534..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg Binary files differdeleted file mode 100755 index 09f4e2f5e8d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg Binary files differdeleted file mode 100755 index cbee8e6dcc0..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg Binary files differdeleted file mode 100755 index 32a2c86d1bd..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg Binary files differdeleted file mode 100755 index 2d2c7a07cf5..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg Binary files differdeleted file mode 100755 index 264ff911794..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg Binary files differdeleted file mode 100755 index 6ce7085e354..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg Binary files differdeleted file mode 100755 index a8b2283e08f..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg Binary files differdeleted file mode 100755 index 461f62d25f2..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png Binary files differdeleted file mode 100644 index 064f09c1a0a..00000000000 --- a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg Binary files differdeleted file mode 100755 index ff792179ae0..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg Binary files differdeleted file mode 100755 index f6e5b5e5a0d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg Binary files differdeleted file mode 100755 index 3baa1c2c054..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg Binary files differdeleted file mode 100755 index 12202654a54..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg Binary files differdeleted file mode 100755 index da0628f3e7e..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg Binary files differdeleted file mode 100755 index 04865427530..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg Binary files differdeleted file mode 100755 index 98f3e5dd916..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg Binary files differdeleted file mode 100755 index 1d0ca076cd0..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg Binary files differdeleted file mode 100755 index de516297c59..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg Binary files differdeleted file mode 100755 index 1f00cfad6c3..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png Binary files differdeleted file mode 100755 index 6aab7fc27e2..00000000000 --- a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg Binary files differdeleted file mode 100755 index 0c571542311..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg Binary files differdeleted file mode 100644 index 65eafe14ac6..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg Binary files differdeleted file mode 100755 index 729547cb164..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg Binary files differdeleted file mode 100755 index 4dc41edd353..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg Binary files differdeleted file mode 100755 index 3c86e53e822..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg Binary files differdeleted file mode 100755 index 5f49e2a8f0d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg Binary files differdeleted file mode 100755 index adfa8c9f5e4..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg Binary files differdeleted file mode 100755 index 8bfd0a93a2d..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg Binary files differdeleted file mode 100755 index eaf6bc21d50..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg Binary files differdeleted file mode 100755 index fbaa3d3ee81..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg +++ /dev/null diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png Binary files differdeleted file mode 100644 index 53b2f37da96..00000000000 --- a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png +++ /dev/null diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js index e2bcb8a09ad..55e21e02f66 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing.js +++ b/addons/mass_mailing/static/src/js/mass_mailing.js @@ -1,12 +1,10 @@ odoo.define('mass_mailing.mass_mailing', function (require) { -var core = require('web.core'); var FieldTextHtml = require('web_editor.backend').FieldTextHtml; var KanbanRecord = require('web_kanban.Record'); +var KanbanColumn = require("web_kanban.Column"); var KanbanView = require('web_kanban.KanbanView'); -var _t = core._t; - KanbanRecord.include({ on_card_clicked: function (event) { if (this.model === 'mail.mass_mailing.campaign') { @@ -17,10 +15,23 @@ KanbanRecord.include({ }, }); +KanbanColumn.include({ + start: function () { + var def = this._super.apply(this, arguments); + var parent = this.getParent(); + if (!parent || parent.model !== "mail.mass_mailing") return def; + + var self = this; + return $.when(def).done(function () { + self.$el.sortable("destroy"); + }); + }, +}); + KanbanView.include({ on_groups_started: function() { this._super.apply(this, arguments); - if (this.dataset.model === 'mail.mass_mailing') { + if (this.dataset.model === 'mail.mass_mailing') { this.$el.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); } }, diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js index 1448611b5c3..1ad2cf2c784 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -9,25 +9,21 @@ var options = require('web_editor.snippets.options'); var snippets_editor = require('web_editor.snippet.editor'); var $editable_area = $("#editable_area"); -if ($editable_area.length === 0 || !$editable_area.is(".o_mail_area")) { - return; -} +var odoo_top = window.top.odoo; // Snippet option for resizing image and column width inline like excel options.registry["width-x"] = options.Class.extend({ start: function () { - this.container_width = 600; - var parent = this.$target.closest('[data-max-width]'); - if (parent.length) { - this.container_width = parseInt(parent.attr('data-max-width')); - } + this.container_width = this.$target.parent().closest("td, table, div").width(); + var self = this; var offset, sib_offset, target_width, sib_width; + var $body = $(document.body); this.is_image = false; - this._super(); + this._super.apply(this, arguments); this.$overlay.find(".oe_handle.e, .oe_handle.w").removeClass("readonly"); - if (this.$target.is('img')) { + if (this.$target.is("img")) { this.$overlay.find(".oe_handle.w").addClass("readonly"); this.$overlay.find(".oe_snippet_move, .oe_snippet_clone").addClass("hidden"); this.is_image=true; @@ -44,88 +40,95 @@ options.registry["width-x"] = options.Class.extend({ if (self.is_image) { compass = "image"; } self.buildingBlock.editor_busy = true; - var $body = $(document.body); - - var body_mousemove = function (event) { + $body.on("mousemove.mass_mailing_width_x", function (event) { event.preventDefault(); offset = self.$target.offset().left; target_width = self.get_max_width(self.$target); if (compass === 'e' && self.$target.next().offset()) { sib_width = self.get_max_width(self.$target.next()); sib_offset = self.$target.next().offset().left; - self.change_width(event, self.$target, target_width, offset ,'plus'); - self.change_width(event, self.$target.next(), sib_width, sib_offset ,'minus'); + self.change_width(event, self.$target, target_width, offset, true); + self.change_width(event, self.$target.next(), sib_width, sib_offset, false); } if (compass === 'w' && self.$target.prev().offset()) { sib_width = self.get_max_width(self.$target.prev()); sib_offset = self.$target.prev().offset().left; - self.change_width(event, self.$target, target_width, offset ,'minus'); - self.change_width(event, self.$target.prev(), sib_width, sib_offset, 'plus'); + self.change_width(event, self.$target, target_width, offset, false); + self.change_width(event, self.$target.prev(), sib_width, sib_offset, true); } if (compass === 'image') { - self.change_width(event, self.$target, target_width, offset ,'plus'); + self.change_width(event, self.$target, target_width, offset, true); } - }; - var body_mouseup = function () { - $body.unbind('mousemove', body_mousemove); - $body.unbind('mouseup', body_mouseup); + }); + $body.on("mouseup.mass_mailing_width_x", function () { + $body.off('.mass_mailing_width_x'); self.buildingBlock.editor_busy = false; self.$target.removeClass("resize_editor_busy"); - }; - $body.mousemove(body_mousemove); - $body.mouseup(body_mouseup); + }); }); }, - change_width: function (event, target ,target_width, offset, type) { - var self = this; - var width; - if (type === 'plus') { - width = event.pageX-offset; - } else { - width = offset + target_width - event.pageX; - } - target.css("width", width + "px"); - self.buildingBlock.cover_target(self.$overlay, self.$target); - return; + change_width: function (event, target, target_width, offset, grow) { + target.css("width", grow ? (event.pageX - offset) : (offset + target_width - event.pageX)); + this.buildingBlock.cover_target(this.$overlay, this.$target); }, - get_int_width: function ($el) { - var el_width = $el.css('width'); - return parseInt(el_width); + get_int_width: function (el) { + return parseInt($(el).css("width"), 10); }, get_max_width: function ($el) { - var max_width = 0; - var self = this; - _.each($el.siblings(),function(sib){ - max_width += self.get_int_width($(sib)); - }); - return this.container_width - max_width; + return this.container_width - _.reduce(_.map($el.siblings(), this.get_int_width), function (memo, w) { return memo + w; }); + }, + on_focus: function () { + this._super.apply(this, arguments); + + if (this.$target.is("td, th")) { + this.$overlay.find(".oe_handle.e, .oe_handle.w").toggleClass("readonly", this.$target.siblings().length === 0); + } }, +}); + +options.registry.table_item = options.Class.extend({ on_clone: function ($clone) { - var clone_index = $(this.$target).index(); - var $table = this.$target.parents('table[data-max-width]'); - if ($table.length === 1){ - _.each($table.find('tbody>tr'),function(row){ - var clone_selector = 'td:eq(' + clone_index + ')'; - var $col_to_clone = $(row).find(clone_selector); - if ($col_to_clone.length !== 0){ - $col_to_clone.after($col_to_clone.clone()); - } + this._super.apply(this, arguments); + + // If we cloned a td or th element... + if (this.$target.is("td, th")) { + // ... and that the td or th element was alone on its row ... + if (this.$target.siblings().length === 1) { + var $tr = $clone.parent(); + $tr.clone().empty().insertAfter($tr).append($clone); // ... move the clone in a new row instead + return; + } + + // ... if not, if the clone neighbor is an empty cell, remove this empty cell (like if the clone content had been put in that cell) + var $next = $clone.next(); + if ($next.length && $next.text().trim() === "") { + $next.remove(); + return; + } + + // ... if not, insert an empty col in each other row, at the index of the clone + var width = $clone.width(); + var $trs = this.$target.closest("table").children("thead, tbody, tfoot").addBack().children("tr").not(this.$target.parent()); + _.each($trs.children(":nth-child(" + this.$target.index() + ")"), function (col) { + $(col).after($("<td/>", {style: "width: " + width + "px;"})); }); } - this._super($clone); - this.buildingBlock.cover_target(this.$overlay, this.$target); }, on_remove: function () { - var remove_index = $(this.$target).index(); - var $table = this.$target.parents('table[data-max-width]'); - if ($table.length === 1){ - _.each($table.find('tbody>tr'),function(row){ - var remove_selector = 'td:eq(' + remove_index + ')'; - $(row).find(remove_selector).remove(); - }); - } this._super.apply(this, arguments); - this.buildingBlock.cover_target(this.$overlay, this.$target); + + // If we are removing a td or th element which was not alone on its row ... + if (this.$target.is("td, th") && this.$target.siblings().length > 0) { + var $trs = this.$target.closest("table").children("thead, tbody, tfoot").addBack().children("tr").not(this.$target.parent()); + if ($trs.length) { // ... if there are other rows in the table ... + var $last_tds = $trs.children(":last-child"); + if (_.reduce($last_tds, function (memo, td) { return memo + (td.innerHTML || ""); }, "").trim() === "") { + $last_tds.remove(); // ... remove the potential full empty column in the table + } else { + this.$target.parent().append("<td/>"); // ... else, if there is no full empty column, append an empty col in the current row + } + } + } }, }); @@ -160,7 +163,7 @@ snippets_editor.Class.include({ all_classes += " " + classname; var images_info = _.defaults($theme.data("imagesInfo") || {}, {all: {}}); _.each(images_info, function (info) { - info = _.defaults(info, {module: "mass_mailing", format: "jpg"}); + info = _.defaults(info, images_info.all, {module: "mass_mailing", format: "jpg"}); }); return { name: name, @@ -179,6 +182,7 @@ snippets_editor.Class.include({ var $body = $(document.body); var $snippets = this.$(".oe_snippet"); + var $snippets_menu = this.$el.find("#snippets_menu"); /** * Create theme selection screen and check if it must be forced opened. @@ -191,6 +195,16 @@ snippets_editor.Class.include({ check_if_must_force_theme_choice(); /** + * Add proposition to install enterprise themes if not installed. + */ + var $mail_themes_upgrade = $dropdown.find(".o_mass_mailing_themes_upgrade"); + $mail_themes_upgrade.on("click", "> a", function (e) { + e.stopImmediatePropagation(); + e.preventDefault(); + odoo_top[window.callback+"_do_action"]("mass_mailing.action_mass_mailing_configuration"); + }); + + /** * Switch theme when a theme button is hovered. Confirm change if the theme button * is pressed. */ @@ -208,13 +222,19 @@ snippets_editor.Class.include({ switch_theme(theme_params); $body.removeClass("o_force_mail_theme_choice"); first_choice = false; - } else { - switch_images(theme_params, $snippets); + + if ($mail_themes_upgrade.length) { + $dropdown.remove(); + $snippets_menu.empty(); + } } + + switch_images(theme_params, $snippets); + selected_theme = theme_params; // Notify form view - window.top.odoo[window.callback+"_downup"]($editable_area.addClass("o_dirty").html()); + odoo_top[window.callback+"_downup"]($editable_area.addClass("o_dirty").html()); }); /** @@ -240,7 +260,7 @@ snippets_editor.Class.include({ check_selected_theme(); $body.addClass(selected_theme.className); - $dropdown.insertAfter(this.$el.find("#snippets_menu")); + $dropdown.insertAfter($snippets_menu); return ret; @@ -327,10 +347,10 @@ snippets_editor.Class.include({ }, }); -var odoo_top = window.top.odoo; -window.top.odoo[window["callback"]+"_updown"] = function (value, fields_values, field_name) { +var callback = window ? window["callback"] : undefined; +odoo_top[callback+"_updown"] = function (value, fields_values, field_name) { if (!window) { - delete odoo_top[window["callback"]+"_updown"]; + delete odoo_top[callback+"_updown"]; return; } @@ -360,7 +380,7 @@ window.top.odoo[window["callback"]+"_updown"] = function (value, fields_values, if (fields_values.mailing_model && web_editor.editor_bar) { if (value.indexOf('on_change_model_and_list') !== -1) { - odoo_top[window["callback"]+"_downup"](_val); + odoo_top[callback+"_downup"](_val); } } }; diff --git a/addons/mass_mailing/static/src/less/mass_mailing.ui.less b/addons/mass_mailing/static/src/less/mass_mailing.ui.less index fd16ddb4ca2..d0c64d62636 100644 --- a/addons/mass_mailing/static/src/less/mass_mailing.ui.less +++ b/addons/mass_mailing/static/src/less/mass_mailing.ui.less @@ -116,6 +116,30 @@ body.o_force_mail_theme_choice { box-shadow: 0 5px 30px 1px fade(black, 60%); } } + + &.o_mass_mailing_themes_upgrade > a .o_thumb { + position: relative; + display: block; + border: 1px dashed white; + opacity: 0.2; + + > .fa { + .o-position-absolute(0, 0, 0, 0); + text-align: center; + font-size: 50px; + color: white; + + &::before { + vertical-align: middle; + } + &::after { + content: ""; + display: inline-block; + height: 100%; + vertical-align: middle; + } + } + } } } } diff --git a/addons/mass_mailing/static/src/less/themes/theme_airmail.less b/addons/mass_mailing/static/src/less/themes/theme_airmail.less deleted file mode 100644 index 513f3dc57c2..00000000000 --- a/addons/mass_mailing/static/src/less/themes/theme_airmail.less +++ /dev/null @@ -1,206 +0,0 @@ -// lessc@1.4.2 - -// ============================ -// Mass Mailing "Theme Airmail" -// ============================ - -@o_mm_airmail_color_alpha: #EAECED; -@o_mm_airmail_color_beta: white; -@o_mm_airmail_color_gamma: #FB3C6B; -@o_mm_airmail_color_delta: darken(@o_mm_airmail_color_gamma, 5%); -@o_mm_airmail_color_epsilon: black; -@o_mm_airmail_color_zeta: #a17e92; - -.o_airmail_theme { - // ===== Colors ===== - .bg-beta { - background-color: @o_mm_airmail_color_gamma; - - .btn.btn-primary { - color: @o_mm_airmail_color_beta; - background-color: @o_mm_airmail_color_zeta; - } - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_airmail_color_beta; - } - } - .text-beta { - color: @o_mm_airmail_color_gamma; - } - .bg-delta { - background-color: @o_mm_airmail_color_zeta; - } - - // ===== Layout ===== - &.o_layout { - background-color: @o_mm_airmail_color_alpha; - - > .o_mail_wrapper { - background: rgba(0, 0, 0, 0); - background: transparent; - border: none; - - > * { - margin-bottom: 16px; - } - } - } - - // ===== Snippets (general) ===== - .o_mail_snippet_general { - background-color: @o_mm_airmail_color_beta; - color: @o_mm_airmail_color_epsilon; - - .btn.btn-primary { - color: @o_mm_airmail_color_beta; - background-color: @o_mm_airmail_color_gamma; - } - - a, .o_mail_link { - color: @o_mm_airmail_color_delta; - } - } - - // ===== Snippets (specific) ===== - .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { - margin-bottom: 0; - - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - } - - .o_mail_h_padding { - padding-left: 0; - padding-right: 0; - } - - .o_mail_header_social { - margin-right: 0px; - a { - color: darken(@o_mm_airmail_color_alpha, 40%); - } - } - } - - .o_mail_block_event { - margin-left: 0; - margin-right: 0; - } - - .o_mail_block_footer_separator { - margin-left: 0; - margin-right: 0; - } - - .o_mail_block_image { - .o_mail_h_padding { - padding: 0; - .o_mail_col_mv { - padding-left: 20px; - padding-right: 20px; - } - > img { - padding: 0; - margin-bottom: 15px; - } - } - } - - .o_mail_block_footer_separator { - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - - .separator { - height: 3px; - background-color: darken(@o_mm_airmail_color_alpha, 10%); - border-bottom: 2px solid darken(white, 3%); - } - } - } - - .o_mail_block_two_cols, .o_mail_block_three_cols { - @tmp-gap: 10px; - - table { - width: 110%; - max-width: (600+(@tmp-gap*2)); - margin: auto (@tmp-gap*-1); - } - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - } - .o_mail_col_container { - padding: 0 0 (@tmp-gap*2); - margin: 0 @tmp-gap; - border-top: 1px solid darken(@o_mm_airmail_color_beta, 10%); - border-bottom: 1px solid darken(@o_mm_airmail_color_alpha, 5%); - background-color: @o_mm_airmail_color_beta; - - > * { - padding: 0 (@tmp-gap*2); - } - - img { - padding: 0!important; - } - } - } - - .o_mail_block_footer_tag_line { - table.o_mail_h_padding { - padding-left: 0; - padding-right: 0; - } - } - - .o_mail_block_image_text { - .o_mail_img_container { - padding: 0 - } - } - - .o_mail_block_text_image { - .o_mail_img_container { - padding: 0 - } - } - - .o_mail_block_footer_social { - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - margin-top: 30px; - border-top: 1px solid darken(@o_mm_airmail_color_alpha, 10%); - } - - .o_mail_footer_social { - border: none; - a { - color: darken(@o_mm_airmail_color_alpha, 40%); - } - } - - .o_mail_footer_links a { - color: darken(@o_mm_airmail_color_alpha, 40%); - } - - .o_mail_footer_copy { - font-weight: bold; - font-size: 9px; - color: darken(@o_mm_airmail_color_alpha, 30%); - } - - &.o_mail_footer_social_left { - .o_mail_footer_description { - padding-left: 0; - } - .o_mail_footer_social { - padding-right: 0; - } - } - } -} diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less index 80a8e523d48..8999132c2ae 100644 --- a/addons/mass_mailing/static/src/less/themes/theme_default.less +++ b/addons/mass_mailing/static/src/less/themes/theme_default.less @@ -35,10 +35,6 @@ .bg-beta { background-color: @o_mm_def_color_zeta; color: @o_mm_def_color_beta; - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_def_color_beta; - } } .text-beta { color: @o_mm_def_color_zeta; @@ -112,6 +108,24 @@ height: 2px; background-color: @o_mm_def_color_alpha; } + + .bg-beta { + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_def_color_beta; + } + + .btn.btn-primary { + background-color: @o_mm_def_color_eta; + } + + a, .btn.btn-link { + color: @o_mm_def_color_eta; + } + } + + td, th { + vertical-align: top; + } } // ===== Snippets (specific) ===== @@ -123,6 +137,9 @@ } .o_mail_header_social { margin-right: 20px; + a { + display: inline-block; + } } } diff --git a/addons/mass_mailing/static/src/less/themes/theme_newsletter.less b/addons/mass_mailing/static/src/less/themes/theme_newsletter.less deleted file mode 100644 index 317116d970c..00000000000 --- a/addons/mass_mailing/static/src/less/themes/theme_newsletter.less +++ /dev/null @@ -1,38 +0,0 @@ -// lessc@1.4.2 - -// =============================== -// Mass Mailing "Theme Newsletter" -// =============================== - -@o_mm_news_color_alpha: #f5f5f5; -@o_mm_news_color_beta: #ffffff; -@o_mm_news_color_gamma: #1cc1a9; -@o_mm_news_color_delta: #464646; -@o_mm_news_color_epsilon: darken(@o_mm_news_color_gamma, 5%); -@o_mm_news_color_zeta: #906784; -@o_mm_news_color_eta: #87a6b5; - -.o_newsletter_theme { - // ===== Colors ===== - .bg-beta { - background-color: @o_mm_news_color_zeta; - color: @o_mm_news_color_beta; - } - .text-beta { - color: @o_mm_news_color_zeta; - } - .bg-delta { - background-color: @o_mm_news_color_eta; - } - - // ===== Snippets (general) ===== - .o_mail_snippet_general { - .btn.btn-primary { - color: @o_mm_news_color_beta; - background-color: @o_mm_news_color_gamma; - } - a, .btn.btn-link { - color: @o_mm_news_color_epsilon; - } - } -} diff --git a/addons/mass_mailing/static/src/less/themes/theme_resto.less b/addons/mass_mailing/static/src/less/themes/theme_resto.less deleted file mode 100644 index 591850a4e3b..00000000000 --- a/addons/mass_mailing/static/src/less/themes/theme_resto.less +++ /dev/null @@ -1,115 +0,0 @@ -// lessc@1.4.2 - -// ========================== -// Mass Mailing "Theme Resto" -// ========================== - -@o_mm_resto_color_alpha: #f0ede0; -@o_mm_resto_color_beta: #ffffff; -@o_mm_resto_color_gamma: #E96D1F; -@o_mm_resto_color_delta: #712b22; -@o_mm_resto_color_epsilon: darken(@o_mm_resto_color_gamma, 5%); -@o_mm_resto_color_zeta: #795745; - -.o_resto_theme { - // ===== Editor ===== - &#web_editor_inside_iframe { - background-color: @o_mm_resto_color_alpha; - } - - // ===== Colors ===== - .bg-beta { - background-color: @o_mm_resto_color_zeta; - color: @o_mm_resto_color_beta; - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_resto_color_beta; - } - } - .text-beta { - color: @o_mm_resto_color_zeta; - } - .bg-delta { - background-color: @o_mm_resto_color_gamma; - color: @o_mm_resto_color_beta; - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_resto_color_beta; - } - } - .text-delta { - color: @o_mm_resto_color_epsilon; - } - - // ===== Layout ===== - &.o_layout { - background-color: @o_mm_resto_color_alpha; - - > .o_mail_wrapper { - border: none; - background-color:transparent; - } - } - - // ===== Snippets (general) ===== - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - color: @o_mm_resto_color_delta; - - .btn.btn-primary { - color: @o_mm_resto_color_beta; - background-color: @o_mm_resto_color_gamma; - } - - a, .o_mail_link { - font-weight: normal; - color: @o_mm_resto_color_epsilon; - } - - .separator { - background-color: lighten(@o_mm_resto_color_zeta, 20%); - } - } - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: darken(@o_mm_resto_color_zeta, 10%); - font-weight: bold; - } - - // ===== Snippets (specific) ===== - .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { - .o_mail_snippet_general { - border-bottom: 5px solid @o_mm_resto_color_gamma; - } - - .o_mail_header_social { - a { - color: @o_mm_resto_color_gamma; - } - } - } - - .o_mail_block_steps { - border-top: 2px solid @o_mm_resto_color_gamma; - background: @o_mm_resto_color_beta; - } - - .o_mail_block_event { - .o_mail_snippet_general{ - background: darken(@o_mm_resto_color_beta, 2%); - } - } - - .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo, .o_mail_block_steps, .o_mail_block_event, .o_mail_block_banner { - margin-left: 20px; - margin-right: 20px; - } - - .o_mail_block_footer_social { - .o_mail_table_styles { - border-top: 2px solid lighten(@o_mm_resto_color_zeta, 20%); - padding-top: 20px; - } - } -} diff --git a/addons/mass_mailing/static/src/less/themes/theme_tech.less b/addons/mass_mailing/static/src/less/themes/theme_tech.less deleted file mode 100644 index 7b7a91ae475..00000000000 --- a/addons/mass_mailing/static/src/less/themes/theme_tech.less +++ /dev/null @@ -1,165 +0,0 @@ -// lessc@1.4.2 - -// ========================= -// Mass Mailing "Theme Tech" -// ========================= - -@o_mm_tech_color_alpha: #333; -@o_mm_tech_color_beta: white; -@o_mm_tech_color_gamma: #59cdcd; -@o_mm_tech_color_delta: #bdbdbd; -@o_mm_tech_color_epsilon: black; -@o_mm_tech_color_zeta: #a17e92; - -.o_tech_theme { - // ===== Colors ===== - .bg-beta { - background-color: @o_mm_tech_color_gamma; - - .btn.btn-primary { - color: @o_mm_tech_color_beta; - background-color: @o_mm_tech_color_zeta; - } - } - .text-beta { - color: @o_mm_tech_color_gamma; - } - .bg-delta { - background-color: @o_mm_tech_color_zeta; - } - - // ===== Layout ===== - &.o_layout { - background-color: @o_mm_tech_color_alpha; - - > .o_mail_wrapper { - background-color: transparent; - color: @o_mm_tech_color_delta; - border: none; - } - } - - // ===== Snippets (general) ===== - .o_mail_snippet_general { - .btn.btn-primary { - color: @o_mm_tech_color_beta; - background-color: @o_mm_tech_color_gamma; - } - - .o_mail_full_width_padding { - padding-left: 20px; - padding-right: 20px; - } - - a, .o_mail_link { - font-weight: normal; - color: @o_mm_tech_color_gamma; - } - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: darken(@o_mm_tech_color_beta, 10%); - } - } - - // ===== Snippets (specific) ===== - .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { - .o_mail_snippet_general { - margin-top: 10px; - margin-bottom: 25px; - padding-left: 20px; - padding-right: 20px; - - > table { - max-width: 560px; - border-bottom: 1px solid darken(@o_mm_tech_color_beta, 60%); - } - } - - .o_mail_h_padding.o_mail_v_padding { - padding: 10px 0 5px; - } - - .o_mail_header_social { - margin-right: 0px; - a { - color: darken(@o_mm_tech_color_beta, 40%); - } - } - } - - .o_mail_block_footer_separator { - .separator { - height: 1px; - background-color: darken(@o_mm_tech_color_beta, 60%); - } - } - - .o_mail_block_event { - margin-left: 20px; - margin-right: 20px; - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_tech_color_alpha; - } - } - - .o_mail_block_discount2 { - .o_code { - color: @o_mm_tech_color_alpha; - } - } - - .o_mail_block_footer_separator { - margin-left: 0; - margin-right: 0; - } - - .o_mail_block_steps { - background-color: transparent; - - h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - color: @o_mm_tech_color_alpha; - } - - .o_mail_full_width_padding > tbody > tr { - background-color: @o_mm_tech_color_beta; - color: @o_mm_tech_color_alpha; - } - } - - .o_mail_block_footer_social { - .o_mail_snippet_general { - background: rgba(0,0,0,0); - background: transparent; - } - - .o_mail_table_styles { - border-top: none; - } - - .o_mail_footer_social { - a { - color: darken(@o_mm_tech_color_beta, 40%); - } - } - - .o_mail_footer_links a { - color: darken(@o_mm_tech_color_beta, 40%); - } - - .o_mail_footer_copy { - font-weight: bold; - font-size: 9px; - color: darken(@o_mm_tech_color_beta, 30%); - } - - &.o_mail_footer_social_left { - .o_mail_footer_description { - padding-left: 0; - } - .o_mail_footer_social { - padding-right: 0; - } - } - } -} diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml index 1d41f2a3b74..71f00f2937d 100644 --- a/addons/mass_mailing/static/src/xml/mass_mailing.xml +++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml @@ -12,6 +12,11 @@ <div class="o_thumb logo" t-attf-style="background-image: url(#{theme.img}_logo.png)"/> </a> </li> + <li t-if="themes.length === 1" class="o_mass_mailing_themes_upgrade"> + <a href="#"> + <div class="o_thumb"><i class="fa fa-plus"/></div> + </a> + </li> </div> </div> </templates> |
