[MERGE] Merged with branch holding the threaded version of OpenChatter. Main modifications: mail.message now have a parent_id field; message searching have a feature to retrieve parents and ancestors until some root ids; xml/js adapted to a threaded display; updated design

bzr revid: tde@openerp.com-20120309094916-n23t6v4v7o3d25xw

1 files changed, 34 insertions, 50 deletions

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c545af05e19..1a04d4e44c0 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -7,18 +7,15 @@
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <div class="oe_mail_wall_tweet">
-                    <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                    <button class="oe_mail_button_comment" type="button">Post comment</button>
+                    <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                    <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
                 </div>
             </div>
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more discussions
-                </button>
-            </div>
-            <div class="oe_mail_wall_nomore">
-                You have loaded all discussions.
+                <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
+                <p class="oe_mail_wall_nomore">You have loaded all discussions.</p>
             </div>
         </div>
         <div class="oe_mail_wall_right">
@@ -26,85 +23,72 @@
     </div>
 
     <t t-name="WallThreadContainer">
-        <div class="oe_mail_wall_thread_header">
-            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-        </div>
-        <div class="oe_mail_wall_thread_content">
-        </div>
     </t>
 
-    <div t-name="Thread" class="oe_mail_thread_main">
+    <div t-name="RecordThread" class="oe_mail_recthread">
         <div class="separator horizontal">OpenSocial</div>
-        <div class="oe_mail_thread_left">
+        <div class="oe_mail_recthread_left">
         </div>
-        <div class="oe_mail_thread_right">
+        <div class="oe_mail_recthread_right">
             <div class="oe_mail_actions">
                 <button type="button" class="oe_mail_button_follow">Follow</button>
                 <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
+                <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_followers">
-                <div class="oe_mail_followers_actions">
-                    <button type="button" class="oe_mail_button_followers">Display followers</button>
-                </div>
+                <h4>Followers</h4>
                 <div class="oe_mail_followers_display">
                 </div>
             </div>
         </div>
     </div>
 
-    <div t-name="ThreadDisplay" class="oe_mail_thread">
+    <div t-name="Thread" class="oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <div class="oe_mail_msg_image">
-            </div>
+            <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..."/><br />
                 <button type="button" class="oe_mail_button_comment">Post comment</button>
             </div>
         </div>
-        <div class="oe_mail_thread_display">
-        </div>
+        <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
-            <button class="oe_mail_button_more" type="button">More</button>
-        </div>
-        <div class="oe_mail_thread_nomore">
-            You have loaded all messages in this thread.
+            <button class="oe_mail_button_more" type="button">Load more messages</button>
+            <p class="oe_mail_p_nomore">You have loaded all messages in this thread.</p>
         </div>
     </div>
 
     <div t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg">
-        <div class="oe_mail_msg_image">
-            <img t-att-src="record.mini_url"/>
-        </div>
+        <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
         <div class="oe_mail_msg_content">
-            <t t-if="record.type == 'email'">
-                <t t-call="EmailDisplay" />
-            </t>
-            <t t-if="record.type == 'notification' || record.type == 'comment'">
-                <t t-call="NotificationDisplay" />
-            </t>
+            <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
+            <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
         </div>
+        <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
     </div>
     
-    <t t-name="NotificationDisplay">
-        <p class="oe_mail_msg_p">
-            <t t-if="record.type == 'notification'">
-                <span class="oe_mail_msg_author">OpenERP System Notification</span>
-            </t>
-            <t t-if="record.type == 'comment'">
-                <span class="oe_mail_msg_author">
-                    <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
-                </span>
+    <t t-name="NoteDisplay">
+        <p class="oe_mail_msg">
+            <span class="oe_mail_oe_fade">
+                <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                <t t-if="record.type == 'notification'">via OpenERP System Notification</t>            
+<!--
+            <t t-if="record.need_action_user_id != false">
+                - <span class="oe_mail_oe_warning">Need action by <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.need_action_user_id[0]}'><t t-raw="record.need_action_user_id[1]"/></a></span>
             </t>
-            wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+-->
+            on <t t-raw="record.date"/></span>
             <br />
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
+            <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
         </p>
     </t>
     
     <t t-name="EmailDisplay">
-        <p class="oe_mail_msg_p oe_mail_msg_p_email_header">
-            From: <t t-esc="email_from"/> on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span><br />
-            To: <t t-sec="mail_to"/><br />
+        <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <span class="oe_mail_oe_bold">From:</span> <t t-esc="email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
+            <span>To:</span> <t t-sec="mail_to"/><br />
+            <span>Subject:</span> <t t-sec="subject"/><br />
         </p>
         <p class="oe_mail_msg_p">
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>