diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-06-03 10:56:05 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-06-03 10:56:05 +0200 |
| commit | e02759a58e15e0dcd58381fb3517d3f3709021e9 (patch) | |
| tree | 6bb41f170e47bc0478e9aeabd6aced73b7ba6f16 /addons/website_mail/static/src | |
| parent | 257631e33126e24ea9422e1f339365f4b585b6cc (diff) | |
[FIX] website_mail: fixed template choice and body duplication in the email designer that was buddy; added some css to the page to make it more look like an email designer; also added a demo data for a template for mass mailing contacts in mass_mailing module.
Diffstat (limited to 'addons/website_mail/static/src')
| -rw-r--r-- | addons/website_mail/static/src/css/website_mail.css | 5 | ||||
| -rw-r--r-- | addons/website_mail/static/src/js/website_email_designer.js | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css index b3c6b7ed942..ef0bbce4ab3 100644 --- a/addons/website_mail/static/src/css/website_mail.css +++ b/addons/website_mail/static/src/css/website_mail.css @@ -17,3 +17,8 @@ transform-origin: 0 0; margin: 0 0px -300px 0; } + +.o_mail_body { + width: 620px; + margin-left: 16px; +}
\ No newline at end of file diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js index bd6516bc955..1ea39ae657c 100644 --- a/addons/website_mail/static/src/js/website_email_designer.js +++ b/addons/website_mail/static/src/js/website_email_designer.js @@ -14,6 +14,9 @@ $('#email_designer').show(); $('#email_template').hide(); $(".js_content", $(this).parent()).children().clone().appendTo('#email_body'); + $(".js_content", $(this).parent()).children().clone().appendTo('#email_body_html'); + $('#email_body').addClass('oe_dirty'); + $('#email_body_html').addClass('oe_dirty'); openerp.website.editor_bar.edit(); event.preventDefault(); |