diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 44 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_followers.xml | 13 |
2 files changed, 18 insertions, 39 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index f67c4e8676f..06a1ce48605 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -17,8 +17,9 @@ <td colspan="2"> <h2 class="oe_view_title"> <span class="oe_view_title_text"> - <t t-if="! widget.params.res_model">News Feeds</t> - <t t-if="widget.params.res_model" t-esc="widget.params.res_model"/> + News Feed + <t t-if="widget.options.res_model"> / </t> + <t t-if="widget.options.res_model" t-esc="widget.options.res_model"/> </span> </h2> </td> @@ -26,19 +27,9 @@ </tr> </tbody> </table> - <div class="oe_mail_wall_main"> - <div class="oe_mail_wall_action"> - <!-- call the composition form --> - <t t-call ="mail.compose_message"/> - </div> - <div class="oe_clear"/> - <ul class="oe_mail_wall_threads"> - <!-- contains threads --> - </ul> - <div class="oe_mail_wall_more"> - <button class="oe_mail_wall_button_more" type="button">See more...</button> - </div> - </div> + <ul class="oe_mail_wall_threads"> + <!-- contains threads --> + </ul> <div class="oe_mail_wall_aside"> <!-- contains currently nothing --> </div> @@ -61,17 +52,6 @@ <div class="oe_mail_recthread_main"> <!-- contains the document thread --> </div> - <div class="oe_mail_recthread_aside"> - <div class="oe_mail_recthread_actions"> - <button type="button" class="oe_mail_button_follow">Follow</button> - <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button> - <button type="button" class="oe_mail_button_followers">Show followers</button> - </div> - <div class="oe_mail_recthread_followers"> - <h4>Followers</h4> - <ul class="oe_mail_followers_display"></ul> - </div> - </div> </div> <!-- @@ -115,20 +95,20 @@ <!-- default layout --> <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg"> <div t-attf-class="oe_mail_msg_#{record.type}"> - <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.mini_url"/> + <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.avatar"/> <div class="oe_mail_msg_content"> <!-- dropdown menu with message options and actions --> <span class="oe_dropdown_toggle oe_dropdown_arrow"> <ul class="oe_dropdown_menu"> - <t t-if="display['show_delete']"> - <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li> + <t t-if="record.is_author"> + <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li> </t> - <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li> + <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li> <!-- Uncomment when adding subtype hiding <li t-if="display['show_hide']"> <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a> </li> --> - <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li> + <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li> <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&id=#{record.id}" class="oe_mail_msg_details">Details</a></li> </ul> </span> @@ -147,7 +127,7 @@ <div class="oe_clear"/> <ul class="oe_mail_msg_footer"> <li t-if="record.subject & params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&id=#{params.res_id}"><t t-raw="record.record_name"/></a></li> - <li><a t-attf-href="#model=res.users&id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li> + <li><a t-attf-href="#model=res.partner&id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li> <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li> <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li> <!-- uncomment when merging vote diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 3bdd18bb0a0..6960e2a3b5f 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -9,13 +9,12 @@ <div class="oe_mail_recthread_actions"> <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button> <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button> - <button type="button" class="oe_mail_button_followers">Show followers</button> </div> - <div class="oe_mail_recthread_subtype"></div> <div class="oe_mail_recthread_followers"> - <t t-if="widget.params.title"> - <h4><t t-raw="widget.params.title"/></h4> + <t t-if="widget.options.title"> + <h4><t t-raw="widget.options.title"/></h4> </t> + <ul class="oe_mail_recthread_subtype"></ul> <ul class="oe_mail_followers_display"></ul> </div> </div> @@ -26,14 +25,14 @@ --> <li t-name="mail.followers.partner"> <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/> - <a t-attf-href="#model=res.users&id=#{record.id}"><t t-raw="record.name"/></a> + <a t-attf-href="#model=res.partner&id=#{record.id}"><t t-raw="record.name"/></a> </li>\ <!-- record_thread.subtype template Template used to display subtype of record --> - <div t-name="mail.record_thread.subtype"> + <li t-name="mail.record_thread.subtype"> <table width="50%"> <tr> <td> @@ -44,6 +43,6 @@ </td> </tr> </table> - </div> + </li> </template> |