diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-08-16 14:21:47 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-08-16 14:21:47 +0530 |
| commit | e1e730ffbcaf58ffcc92b7bdf88b779bb3ec714c (patch) | |
| tree | 1349327760559ba5eec43934bd48d4f03b4fede6 /addons/mail/static/src/xml/mail.xml | |
| parent | 463d06651ad84d62dcc9476d19962e18dec6ae92 (diff) | |
| parent | f4f7de136921528f4b465629ff756b367ee0bba7 (diff) | |
[Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120816085147-o1wzevd3cj85vm2y
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 86d115f29c8..7f49b7f3943 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -16,7 +16,10 @@ <tr class="oe_header_row oe_header_row_top"> <td colspan="2"> <h2 class="oe_view_title"> - <span class="oe_view_title_text">All Feeds</span> + <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"/> + </span> </h2> </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> @@ -58,29 +61,9 @@ <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 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_followers"> - <h4>Followers</h4> - <ul class="oe_mail_followers_display"></ul> - </div> - </div> </div> <!-- - record_thread.subscriber template - Template used to display a subscriber. - --> - <li t-name="mail.record_thread.subscriber"> - <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> - </li> - - <!-- mail.compose_message template This template holds the composition form to write a note or send an e-mail. It contains by default a textarea, that will be replaced |