[IMP] messages display

bzr revid: abo@openerp.com-20120619182810-k4m1w8gkntdw5weq

1 files changed, 49 insertions, 25 deletions

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7458f972fa2..adedb8e6bc3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -147,44 +147,68 @@
     <t t-name="mail.Thread.new.NoteDisplay">
         <a class="oe_gear_menuaction oe_i">B</a>
         <ul class="oe_gear_menu">
-            <li><a href="#">Delete</a></li>
-            <li><a href="#">Hide</a></li>
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])">
+                    <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></li>
+                </t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))">
+                    <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></li>
+                </t>
+            </t>
         </ul>
+        
         <div class="oe_mail_msg">
-            <!--
-            <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            </t>
-            -->
-            <t t-if="record.subject">
+             <t t-if="record.subject">
                 <h1 class="oe_mail_msg_title">
-                    <a href="#permalink"><t t-raw="record.subject"/></a>
+                    <a href="#" class="oe_mail_internal_link"><t t-raw="record.subject"/></a>
                 </h1>
             </t>
+            
             <p class="oe_mail_msg_subtitle">
-                <a href="#" class="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="params.thread_level > 0">
+                    <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
+                     · 
+                </t>
+                <span class="oe_mail_msg_author"><a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a></span>
                  · 
-                <t t-raw="record.date"/>
+                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
             </p>
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            
+            <div class="oe_mail_msg_body"><t t-raw="record.body"/></div>
             <t t-if="record.tr_body">
-                <span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span>
-            </t><br/>
-            <ul class="oe_mail_msg_intlinks">
+                <div class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></div>
+            </t>
+            
+            <ul class="oe_mail_msg_footer">
               <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                <li><a href="#" class="oe_mail_msg_reply">Reply</a> · </li>
               </t>
-              <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
-              </t>
-              <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
+              <li><a href="#">Like</a> · </li>
+              <t t-if="record.attachment_ids.length > 0">
+                <li>
+                    <a href="#" class="oe_mail_msg_view_attachments">
+                        <t t-if="record.attachment_ids.length == 1">Attachment</t>
+                        <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                    </a>
+                </li>
               </t>
             </ul>
+            
+            <t t-if="record.attachment_ids.length > 0">
+                <div class="oe_clear"></div>
+                
+                <ul class="oe_mail_msg_attachments">
+                    <t t-foreach="record.attachments" t-as="attachment">
+                        <li>
+                            <a href="#" data-res-model='ir.attachment' t-attf-data-res-id='{attachment.id}' class="oe_mail_internal_link">
+                                <t t-raw="attachment.name"/>
+                            </a>
+                        </li>
+                    </t>
+                </ul>
+            </t>
         </div>
     </t>