[MERGE]merge with trunk

bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g

1 files changed, 92 insertions, 14 deletions

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 07b24725b05..3a37218c813 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -4,48 +4,126 @@
         <record id="action_mail_inbox_feeds" model="ir.actions.client">
             <field name="name">Inbox</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]), ('to_read', '=', True)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'} }&quot;"/>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('notification_ids.partner_id.user_ids', 'in', [uid]),
+                  ('to_read', '=', True),
+                  ('favorite_user_ids', 'not in', [uid])
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read'
+            }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>Good Job!</b> Your inbox is empty.
+                </p><p>
+                    Your inbox contains private messages or emails sent to you
+                    as well as information related to documents or people you
+                    follow.
+                </p>
+            </field>
         </record>
 
         <record id="action_mail_to_me_feeds" model="ir.actions.client">
             <field name="name">To: me</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('partner_ids.user_ids', 'in', [uid]), ('to_read', '=', True), ('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'} }&quot;"/>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_unread': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('partner_ids.user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'read', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No private message.</b>
+                </p><p>
+                    This list contains messages sent to you.
+                </p>
+            </field>
         </record>
 
         <record id="action_mail_star_feeds" model="ir.actions.client">
-            <field name="name">Favorites</field>
+            <field name="name">Todo</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('favorite_user_ids.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'stared'} }&quot;"/>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_unread': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('favorite_user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'read', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No todo!</b>
+                </p><p>
+                    When you process messages in your inbox, you can mark some
+                    as <i>todo</i>. From this menu, you can process all your todo.
+                </p>
+            </field>
         </record>
 
         <record id="action_mail_archives_feeds" model="ir.actions.client">
             <field name="name">Archives</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]), ('to_read', '=', False)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'archives'} }&quot;"/>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_read': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'unread', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    No message found.
+                </p>
+            </field>
         </record>
 
         <record id="action_mail_sent_feeds" model="ir.actions.client">
             <field name="name">Sent</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'send'} }&quot;"/>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('author_id.user_ids', 'in', [uid])],
+                'view_mailbox': True, }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No message sent yet.</b>
+                </p><p>
+                    Click on the top-right icon to compose a message. This
+                    message will be sent by email if it's an internal contact.
+                </p>
+            </field>
         </record>
 
         <!-- MENU -->
 
         <!-- Top menu item -->
-        <menuitem name="Emails"
+        <menuitem name="Messaging"
           id="mail.mail_feeds_main"
           groups="base.group_user"
           sequence="10"/>
 
         <!-- Left-side menu: Feeds -->
-        <menuitem id="mail.mail_feeds" name="Messages" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
+        <menuitem id="mail.mail_feeds" name="Messaging" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
         <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
 
         <record id="mail_inboxfeeds" model="ir.ui.menu">
@@ -61,7 +139,7 @@
           <field name="parent_id" ref="mail.mail_feeds"/>
         </record>
         <record id="mail_starfeeds" model="ir.ui.menu">
-          <field name="name">Favorites</field>
+          <field name="name">Todo</field>
           <field name="sequence" eval="14"/>
           <field name="action" ref="action_mail_star_feeds"/>
           <field name="parent_id" ref="mail.mail_feeds"/>