diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-06-28 12:29:42 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-06-28 12:29:42 +0200 |
| commit | f8daa47a0a5a34e302d00a92beb282072055c2a1 (patch) | |
| tree | 32a3e141b6c19fded84efb4e935982ebbe930dd4 /addons/mail | |
| parent | 06c9e2eb71ba208509ccc2a0a827cbdbd33e5d04 (diff) | |
| parent | b0cd65959e1775ead658da94e225faf244d3f1d9 (diff) | |
[MERGE] portal, group_user on fields, contact form, default portal menu
bzr revid: al@openerp.com-20120628102942-ja0qtr1eho4z3749
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/mail_thread_view.xml | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 6bac1a49f2e..a32045efafc 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,7 +5,8 @@ <!-- toplevel menu --> <menuitem id="mail_feeds_main" name="Feeds" sequence="0" web_icon="static/src/img/feeds.png" - web_icon_hover="static/src/img/feeds-hover.png" /> + web_icon_hover="static/src/img/feeds-hover.png" + groups="base.group_user"/> <!-- left-side menu: Feeds !--> <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/> diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 5ff8a996116..34445c48f8d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <template> - <div t-name="mail.Wall" class="oe_mail_wall"> + <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global"> <table class="oe_view_manager_header"> + <colgroup> + <col width="33%"/> + <col width="33%"/> + <col width="34%"/> + </colgroup> + <tbody> <tr class="oe_header_row"> - <td><h2 class="oe_view_title">All Feeds</h2></td> + <td colspan="2"> + <h2 class="oe_view_title"> + <span class="oe_view_title_text">All Feeds</span> + </h2> + </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> + </tbody> </table> <div class="oe_mail_wall_main"> <div class="oe_mail_wall_action"> |