diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 25 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/web_kanban_activity.xml | 62 |
2 files changed, 50 insertions, 37 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 2ddcea9121f..cb7f8a5ae28 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -75,9 +75,10 @@ </div> </t> <div class="o_thread_message_tools btn-group"> - <span class="o_mark_as_done" data-toggle="popover" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"><a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8"> - <i class="fa fa-check"/> Mark Done - </a></span> + <span class="o_mark_as_done" data-toggle="popover" t-att-data-activity-id="activity.id" t-att-data-force-next-activity="activity.force_next" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"> + <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8"> + <i class="fa fa-check"/> Mark Done </a> + </span> <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_edit_activity o_activity_link" t-att-data-activity-id="activity.id"> <i class="fa fa-pencil"/> Edit </a> @@ -94,12 +95,18 @@ <div> <textarea class="form-control" rows="3" id="activity_feedback" placeholder="Write Feedback"/> <div class="mt8"> - <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id"> - Done & Schedule Next</button> - <button type="button" class="btn btn-sm btn-primary o_activity_popover_done"> - Done</button> - <button type="button" class="btn btn-sm btn-link o_activity_popover_discard"> - Discard</button> + <t t-if="!force_next"> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id"> + Done & Schedule Next</button> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done"> + Done</button> + <button type="button" class="btn btn-sm btn-link o_activity_popover_discard"> + Discard</button> + </t> + <t t-else=""> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next"> + Done & Launch Next</button> + </t> </div> </div> </t> diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml index 31d23859488..25d25c1d09b 100644 --- a/addons/mail/static/src/xml/web_kanban_activity.xml +++ b/addons/mail/static/src/xml/web_kanban_activity.xml @@ -29,38 +29,44 @@ <t t-esc="selection[key]" /> (<t t-esc="logs.length"/>) </strong> </li> - <li t-foreach="logs" t-as="log" t-att-data-activity-id="log.id" class="nav-item o_edit_activity" role="menuitem"> - <div class="o_activity_title float-left"> - <span t-attf-class="fa #{log.icon} fa-fw" role="img" aria-label="Log" title="Log"/> - <strong> - <t t-esc="log.title_action or log.activity_type_id[1]" /> - </strong> - <div> - <span class="fa fa-clock-o fa-fw" role="img" aria-label="Deadline" title="Deadline"/> - <span t-att-title="log.date_deadline"><t t-esc="log.label_delay" /></span> - <div class="mt16" t-att-data-activity-id="log.id" t-att-data-previous-activity-type-id="log.activity_type_id[0]"> - <t t-if="log.mail_template_ids"> - <t t-foreach="log.mail_template_ids" t-as="mail_template"> - <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 t-foreach="logs" t-as="log"> + <t t-set="edit_class" t-value="'o_edit_activity'"/> + <t t-if="log.force_next"> + <t t-set="edit_class" t-value=""/> + </t> + <li t-att-data-activity-id="log.id" t-attf-class="nav-item o_log_activity #{edit_class}" role="menuitem"> + <div class="o_activity_title float-left"> + <span t-attf-class="fa #{log.icon} fa-fw" role="img" aria-label="Log" title="Log"/> + <strong> + <t t-esc="log.title_action or log.activity_type_id[1]" /> + </strong> + <div> + <span class="fa fa-clock-o fa-fw" role="img" aria-label="Deadline" title="Deadline"/> + <span t-att-title="log.date_deadline"><t t-esc="log.label_delay" /></span> + <div class="mt16" t-att-data-activity-id="log.id" t-att-data-force-next-activity="log.force_next" t-att-data-previous-activity-type-id="log.activity_type_id[0]"> + <t t-if="log.mail_template_ids"> + <t t-foreach="log.mail_template_ids" t-as="mail_template"> + <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> </t> + </div> + <t t-if="log.user_id[0] != uid"> + <span class="ml4 fa fa-user" role="img" aria-label="User" title="User"/> + <span><t t-esc="log.user_id[1]" /></span> </t> </div> - <t t-if="log.user_id[0] != uid"> - <span class="ml4 fa fa-user" role="img" aria-label="User" title="User"/> - <span><t t-esc="log.user_id[1]" /></span> - </t> </div> - </div> - <div class="float-right"> - <span class="o_mark_as_done o_activity_link o_activity_link_kanban fa fa-check-circle fa-2x mt4" t-att-data-previous-activity-type-id="log.activity_type_id[0]" t-att-data-activity-id="log.id" title="Mark as done" role="img" aria-label="Mark as done"/> - </div> - </li> + <div class="float-right"> + <span class="o_mark_as_done o_activity_link o_activity_link_kanban fa fa-check-circle fa-2x mt4" t-att-data-force-next-activity="log.force_next" t-att-data-previous-activity-type-id="log.activity_type_id[0]" t-att-data-activity-id="log.id" title="Mark as done" role="img" aria-label="Mark as done"/> + </div> + </li> + </t> </t> </ul> </div> |