diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-20 11:42:03 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-20 11:42:03 +0530 |
| commit | ec27d7e44fab5b39ea8577de7bfa7b9f3a5b5bf2 (patch) | |
| tree | cdf1c0b60fefc14bd1769a437f9ac09b70783e1a /addons/mail | |
| parent | c45d68d6b80c3a339463d37ecc3bbd766ef101d3 (diff) | |
| parent | 7df568d138348aa00be74340d2c5d408dd239da6 (diff) | |
[MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/mail_message_view.xml | 1 | ||||
| -rw-r--r-- | addons/mail/mail_thread_view.xml | 11 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 9159190ab29..34ba6db1477 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -73,6 +73,7 @@ <search string="Messages Search"> <field name="user_id"/> <field name="body"/> + <field name="model" string="Message" filter_domain="['|', ('subject', 'ilike', self), ('body_text', 'ilike', self)]" /> </search> </field> </record> diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index a32045efafc..f07e1e467ee 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -2,11 +2,11 @@ <openerp> <data> - <!-- 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" - groups="base.group_user"/> + <!-- Top menu item --> + <menuitem name="Feeds" + id="mail_feeds_main" + groups="base.group_user" + sequence="10"/> <!-- left-side menu: Feeds !--> <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/> @@ -22,5 +22,6 @@ <field name="action" ref="action_mail_my_feeds"/> <field name="parent_id" ref="mail_feeds"/> </record> + </data> </openerp> diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 982fb8aeb2f..ce15f83a3d4 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <template> - <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global"> + <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_current"> <table class="oe_view_manager_header"> <colgroup> <col width="33%"/> @@ -9,7 +9,7 @@ <col width="34%"/> </colgroup> <tbody> - <tr class="oe_header_row"> + <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> |