diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/discuss.xml | 15 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 36 |
2 files changed, 50 insertions, 1 deletions
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index b0a3bfe1ba9..0bfec270eea 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -29,6 +29,12 @@ <t t-set="counter" t-value="starred_counter"/> <t t-call="mail.chat.SidebarNeedaction"/> </div> + <div t-if="isModerator" t-attf-class="o_mail_chat_title_main o_mail_chat_channel_item #{(active_channel_id == 'channel_moderation') ? 'o_active': ''}" + data-channel-id="channel_moderation"> + <span class="o_channel_name"> <i class="fa fa-envelope mr8"/>Moderation Queue</span> + <t t-set="counter" t-value="moderationCounter"/> + <t t-call="mail.chat.SidebarNeedaction"/> + </div> <hr class="mb8"/> <t t-set="channel_type" t-value="'public'"/> @@ -137,6 +143,11 @@ <button type="button" class="btn btn-default btn-sm o_mail_chat_button_unstar_all" title="Unstar all messages">Unstar all</button> <button type="button" class="btn btn-default btn-sm o_mail_chat_button_dm visible-xs" title="New Message">New Message</button> <button t-if="!disable_add_channel" type="button" class="btn btn-default btn-sm o_mail_chat_button_public o_mail_chat_button_private visible-xs" title="New Channel">New Channel</button> + <button type="button" class="btn btn-default btn-sm o_hidden o_mail_chat_button_select_all" title="Select all messages to moderate">Select All</button> + <button type="button" class="btn btn-default btn-sm o_hidden o_mail_chat_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button> + <button type="button" data-decision="accept" class="btn btn-default btn-sm o_mail_chat_button_moderate_all" title="Accept selected messages">Accept</button> + <button type="button" data-decision="reject" class="btn btn-default btn-sm o_mail_chat_button_moderate_all" title="Reject selected messages">Reject</button> + <button type="button" data-decision="discard" class="btn btn-default btn-sm o_mail_chat_button_moderate_all" title="Discard selected messages">Discard</button> </div> </t> @@ -145,6 +156,10 @@ <input type="text" class="o_input o_mail_chat_partner_invite_input" id="mail_search_partners"/> </div> + <div t-name="mail.ModeratorRejectMessageDialog"> + <input class="form-control" type="text" id="message_title" placeholder="Subject" value="Message Rejected"/> + <textarea class="form-control mt16" id="reject_message" placeholder="Mail Body">Your message was rejected by moderator.</textarea> + </div> <!-- Mobile templates --> <t t-name="mail.discuss_mobile"> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 5ef23d46c43..20049e89cf6 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -103,6 +103,10 @@ <div class="o_thread_title">No starred message</div> <div>You can mark any message as 'starred', and it shows up in this channel.</div> </t> + <t t-if="options.channel_id==='channel_moderation'"> + <div class="o_thread_title">You have no message to moderate</div> + <div>Pending moderation messages appear here.</div> + </t> </div> <t t-name="mail.ChatThread.Content"> @@ -144,6 +148,7 @@ </div> <div class="o_thread_message_core"> <p t-if="message.display_author" class="o_mail_info text-muted"> + <input t-if="message.needsModeration and message.isModerator" type="checkbox" class="moderation_checkbox" t-att-data-message-id="message.id"/> <t t-if="message.is_note"> Note by </t> @@ -185,7 +190,7 @@ </span> </span> <span t-attf-class="o_thread_icons"> - <i t-if="options.display_stars && !message.is_system_notification" + <i t-if="options.display_stars and !message.is_system_notification and !message.needsModeration" t-att-class="'fa fa-lg o_thread_icon o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" t-att-data-message-id="message.id" title="Mark as Todo"/> <i t-if="message.record_name && message.model != 'mail.channel' && options.display_reply_icon" @@ -194,6 +199,15 @@ <i t-if="message.is_needaction && options.display_needactions" class="fa fa-check o_thread_icon o_thread_message_needaction" t-att-data-message-id="message.id" title="Mark as Read"/> + + <t t-if="message.needsModeration and message.model === 'mail.channel'"> + <t t-if="message.isModerator"> + <t t-call="mail.MessageModerationDecision"/> + </t> + <t t-elif="message.is_author"> + <t t-call="mail.MessageModerationFeedback"/> + </t> + </t> </span> </p> <div class="o_thread_message_content"> @@ -227,6 +241,26 @@ </t> </t> + <t t-name="mail.MessageModerationDecision"> + <i class="o_thread_icon ml4 o_thread_message_moderation text-success" + t-att-data-message-id="message.id" data-decision="accept" title="Accept"><b>Accept |</b></i> + <i class="o_thread_icon ml4 o_thread_message_moderation text-danger" + t-att-data-message-id="message.id" data-decision="reject" title="Remove message with explanation"><b>Reject |</b></i> + <i class="o_thread_icon ml4 o_thread_message_moderation text-danger" + t-att-data-message-id="message.id" data-decision="discard" title="Remove message without explanation"><b>Discard |</b></i> + <i class="o_thread_icon ml4 o_thread_message_moderation text-success" + t-att-data-message-id="message.id" data-decision="allow" title="Add this email address to white list of people"><b>Always Allow |</b></i> + <i class="o_thread_icon ml4 o_thread_message_moderation text-danger" + t-att-data-message-id="message.id" data-decision="ban" title="Ban this email address"><b>Ban</b></i> + </t> + + <t t-name="mail.MessageModerationFeedback"> + <i class="text-danger" title="Your message is pending moderation"><b>Pending moderation</b></i> + </t> + + + + <t t-name="mail.MessagesSeparator"> <div class="o_thread_new_messages_separator"> <span class="o_thread_separator_label">New messages</span> |