diff options
| author | Thibault Delavallée <tde@odoo.com> | 2018-08-06 12:02:59 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2018-08-06 16:24:43 +0200 |
| commit | 027b3a35d7e15b0a8c66979459845fe21acf19df (patch) | |
| tree | 5212832a8981cdb9b27fd641beaba9cbde1a8452 /addons/mail/static/src/xml/activity.xml | |
| parent | 92dcbfe8d06927ce0a7afb2dddd9eeea22b3735b (diff) | |
[IMP] mail: improve use of templates linked to activities
Purpose: Give the ability to people to directly sign (sic) an email template
without opening the mail composer.
Specifications
* do not display 'email' in activity view: either there are emails and new
display applies, either there aren't any and do not dispaly anything;
* update display of template choice: https://www.awesomescreenshot.com/image/3531694/7f6ac0250009599089ec62b6951a88b4;
* add an "mt 16" between activity and first mail template;
Tests have been updated to new specifications.
This commit is linked to task ID 1872169 and PR #26185.
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 7d8e0ad7455..bd4a0fd044a 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -61,10 +61,16 @@ <div t-if="activity.note" t-attf-class="o_thread_message_#{activity.activity_decoration ? activity.activity_decoration : 'note'} #{activity.activity_decoration ? 'alert alert-' + activity.activity_decoration : ''} small"> <t t-raw="activity.note"/> </div> - <t t-if="activity.mail_template_ids"> - <div t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"><b>Email:</b> + <t t-if="activity.mail_template_ids && activity.mail_template_ids.length > 0"> + <div class="mt16" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"> <t t-foreach="activity.mail_template_ids" t-as="mail_template"> - <span class="o_mail_template" t-att-data-template-id="mail_template.id"><t t-esc="mail_template.name"/></span> + <div> + <i class="fa fa-envelope-o" aria-label="Mail" title="Mail" role="img"></i> + <span t-esc="mail_template.name"/>: + <span class="o_activity_template_preview" t-att-data-template-id="mail_template.id">Preview</span> + <span class="text-muted">or</span> + <span class="o_activity_template_send" t-att-data-template-id="mail_template.id">Send Now</span> + </div> </t> </div> </t> |