From 73b14dae77dfa0d6b9a5b31f3cfcdc2046382214 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 12 Jun 2012 16:47:40 +0200
Subject: mail define new layout blog/default

bzr revid: al@openerp.com-20120612144740-gnx4z9h0tnpy6cha
---
 addons/mail/static/src/xml/mail.xml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a34e362960b..04a373fc8a5 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -57,19 +57,21 @@
         </div>
     </ul>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+<!-- default layout -->
+
+    <li t-name="mail.Thread.default" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image 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="NoteDisplay" /></t>
+                <t t-if="record.type == 'email'"><t t-call="mail.Thread.default.EmailDisplay"/></t>
+                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.default.NoteDisplay" /></t>
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
     </li>
-    
-    <t t-name="NoteDisplay">
+
+    <t t-name="mail.Thread.default.NoteDisplay">
         <p 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>
@@ -98,8 +100,8 @@
             </ul>
         </p>
     </t>
-    
-    <t t-name="EmailDisplay">
+
+    <t t-name="mail.Thread.default.EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <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>
@@ -129,4 +131,18 @@
         </ul>
     </t>
 
+<!-- blog layout -->
+
+    <li t-name="mail.Thread.blogs" t-attf-class="oe_mail oe_mail_thread_msg">
+        <div t-attf-class="oe_mail_msg_#{record.type}">
+            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
+            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image 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="NoteDisplay" /></t>
+            </div>
+            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
+        </div>
+    </li>
+
 </template>
-- 
cgit v1.2.3


From 87d4588d4b5633a1480b09c7c2a33a858aa49e97 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 15 Jun 2012 15:10:26 +0200
Subject: [IMP] better look for mail messages

bzr revid: abo@openerp.com-20120615131026-t6af0vdg49tsqpsk
---
 addons/mail/static/src/xml/mail.xml | 72 +++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 04a373fc8a5..69012ae77ee 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -57,7 +57,7 @@
         </div>
     </ul>
 
-<!-- default layout -->
+    <!-- default layout -->
 
     <li t-name="mail.Thread.default" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
@@ -131,18 +131,78 @@
         </ul>
     </t>
 
-<!-- blog layout -->
+    <!-- new layout -->
 
-    <li t-name="mail.Thread.blogs" t-attf-class="oe_mail oe_mail_thread_msg">
+    <li t-name="mail.Thread.new" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image 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="NoteDisplay" /></t>
+                <t t-if="record.type == 'email'"><t t-call="mail.Thread.new.EmailDisplay" /></t>
+                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.new.NoteDisplay" /></t>
             </div>
-            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
+            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.new.ThreadDisplay" /></t>
         </div>
     </li>
 
+    <t t-name="mail.Thread.new.NoteDisplay">
+        <p 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>
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
+            <ul>
+              <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>
+              </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>
+              </t>
+              <li>
+                <span class="oe_fade"><t t-raw="record.date"/>
+                  by <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>
+                </span>
+              </li>
+            </ul>
+        </p>
+    </t>
+
+    <t t-name="mail.Thread.new.EmailDisplay">
+        <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <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>
+        </p>
+        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
+        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
+        <p class="oe_mail_msg">
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
+        </p>
+
+        <ul>
+          <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>
+          </t>
+          <li>
+            <span class="oe_fade"><t t-raw="record.date"/></span>
+          </li>
+        </ul>
+    </t>
+
 </template>
-- 
cgit v1.2.3


From 3ebcb195d0ba17f0348dd3f23083b4358738ae3a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 15 Jun 2012 19:26:47 +0200
Subject: [IMP] continue to improve new messages layout

bzr revid: abo@openerp.com-20120615172647-vfnbd2x4ve0q6w3g
---
 addons/mail/static/src/xml/mail.xml | 71 ++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 44 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 69012ae77ee..7458f972fa2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -65,9 +65,9 @@
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="mail.Thread.default.EmailDisplay"/></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.default.NoteDisplay" /></t>
+                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.default.NoteDisplay"/></t>
             </div>
-            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
+            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay"/></t>
         </div>
     </li>
 
@@ -138,21 +138,39 @@
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-if="record.type == 'email'"><t t-call="mail.Thread.new.EmailDisplay" /></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.new.NoteDisplay" /></t>
+                <t t-call="mail.Thread.new.NoteDisplay"/>
             </div>
-            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.new.ThreadDisplay" /></t>
+            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.new.ThreadDisplay"/></t>
         </div>
     </li>
 
     <t t-name="mail.Thread.new.NoteDisplay">
-        <p class="oe_mail_msg">
+        <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>
+        </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">
+                <h1 class="oe_mail_msg_title">
+                    <a href="#permalink"><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-raw="record.date"/>
+            </p>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
-            <ul>
+            <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">
               <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>
               </t>
@@ -166,43 +184,8 @@
                   <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>
               </t>
-              <li>
-                <span class="oe_fade"><t t-raw="record.date"/>
-                  by <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>
-                </span>
-              </li>
             </ul>
-        </p>
-    </t>
-
-    <t t-name="mail.Thread.new.EmailDisplay">
-        <p class="oe_mail_msg oe_mail_msg_p_email_header">
-            <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>
-        </p>
-        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
-        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
-        <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-        </p>
-
-        <ul>
-          <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>
-          </t>
-          <li>
-            <span class="oe_fade"><t t-raw="record.date"/></span>
-          </li>
-        </ul>
+        </div>
     </t>
 
 </template>
-- 
cgit v1.2.3


From 7e674428333b9e8b9496be9c2c75f0cc67f7632e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 19 Jun 2012 20:28:10 +0200
Subject: [IMP] messages display

bzr revid: abo@openerp.com-20120619182810-k4m1w8gkntdw5weq
---
 addons/mail/static/src/xml/mail.xml | 74 ++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 25 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

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>
 
-- 
cgit v1.2.3


From 7d53b3977f9698d47583902f2c7be523f8bd8f27 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 20 Jun 2012 16:02:04 +0200
Subject: [IMP] attachments display and accessibility in mail messages a user
 can now download an attachment in one click

bzr revid: abo@openerp.com-20120620140204-1mphi5tjyp57i74t
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index adedb8e6bc3..87b82899cd6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -202,7 +202,7 @@
                 <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">
+                            <a t-att-href="attachment.url">
                                 <t t-raw="attachment.name"/>
                             </a>
                         </li>
-- 
cgit v1.2.3


From 231b8ca886f0879186ce2a5ed82632ccec271557 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 20 Jun 2012 16:32:22 +0200
Subject: [IMP] better markup, remove some dead code

bzr revid: abo@openerp.com-20120620143222-oyw84qxbzlia7lb6
---
 addons/mail/static/src/xml/mail.xml | 86 +++----------------------------------
 1 file changed, 5 insertions(+), 81 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 87b82899cd6..e972e2d3f28 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -29,8 +29,7 @@
 
     <div t-name="RecordThread" class="oe_mail_recthread">
         <h4>History and Comments</h4>
-        <div class="oe_mail_recthread_left">
-        </div>
+        <div class="oe_mail_recthread_left"></div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
@@ -44,7 +43,7 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail oe_mail_thread">
+    <div t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
@@ -55,96 +54,21 @@
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
         </div>
-    </ul>
+    </div>
 
     <!-- default layout -->
-
     <li t-name="mail.Thread.default" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-if="record.type == 'email'"><t t-call="mail.Thread.default.EmailDisplay"/></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.default.NoteDisplay"/></t>
+                <t t-call="mail.Thread.default.NoteDisplay"/>
             </div>
-            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay"/></t>
+            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.default.ThreadDisplay"/></t>
         </div>
     </li>
 
     <t t-name="mail.Thread.default.NoteDisplay">
-        <p 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>
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
-            <ul>
-              <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>
-              </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>
-              </t>
-              <li>
-                <span class="oe_fade"><t t-raw="record.date"/>
-                  by <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>
-                </span>
-              </li>
-            </ul>
-        </p>
-    </t>
-
-    <t t-name="mail.Thread.default.EmailDisplay">
-        <p class="oe_mail_msg oe_mail_msg_p_email_header">
-            <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>
-        </p>
-        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
-        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
-        <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-        </p>
-
-        <ul>
-          <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>
-          </t>
-          <li>
-            <span class="oe_fade"><t t-raw="record.date"/></span>
-          </li>
-        </ul>
-    </t>
-
-    <!-- new layout -->
-
-    <li t-name="mail.Thread.new" t-attf-class="oe_mail oe_mail_thread_msg">
-        <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
-            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
-            <div class="oe_mail_msg_content">
-                <t t-call="mail.Thread.new.NoteDisplay"/>
-            </div>
-            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.new.ThreadDisplay"/></t>
-        </div>
-    </li>
-
-    <t t-name="mail.Thread.new.NoteDisplay">
         <a class="oe_gear_menuaction oe_i">B</a>
         <ul class="oe_gear_menu">
             <t t-if="display['show_delete']">
-- 
cgit v1.2.3


From 688ced2225e6491a78c9a100aed8ed7984a7fbc1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 20 Jun 2012 17:54:34 +0200
Subject: [ADD] introduce timeago.js (check the end of mail.js)

bzr revid: abo@openerp.com-20120620155434-8qos8oooxfwxkm6u
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e972e2d3f28..fe371de5728 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -97,7 +97,7 @@
                 </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>
                  · 
-                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+                <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
             </p>
             
             <div class="oe_mail_msg_body"><t t-raw="record.body"/></div>
-- 
cgit v1.2.3


From c8e5450ba3a0976b84777a89b4e1142abbf7af13 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 21 Jun 2012 14:48:43 +0200
Subject: [IMP] use the default openerp dropdown menu implementation. also
 improve markup (ul.oe_mail_wall_threads is now a list of
 li.oe_mail_wall_thread) more markup and css improvements to come

bzr revid: abo@openerp.com-20120621124843-klk1oy2rxdcd08uh
---
 addons/mail/static/src/xml/mail.xml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index fe371de5728..a5d669a4f00 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,8 +15,8 @@
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
-            <div class="oe_mail_wall_threads">
-            </div>
+            <ul class="oe_mail_wall_threads">
+            </ul>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
@@ -57,7 +57,7 @@
     </div>
 
     <!-- default layout -->
-    <li t-name="mail.Thread.default" t-attf-class="oe_mail oe_mail_thread_msg">
+    <div t-name="mail.Thread.default" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
             <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
@@ -66,22 +66,23 @@
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.default.ThreadDisplay"/></t>
         </div>
-    </li>
+    </div>
 
     <t t-name="mail.Thread.default.NoteDisplay">
-        <a class="oe_gear_menuaction oe_i">B</a>
-        <ul class="oe_gear_menu">
-            <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>
+        <span class="oe_dropdown_toggle oe_dropdown_arrow">
+            <ul class="oe_dropdown_menu">
+                <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 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-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>
-            </t>
-        </ul>
+            </ul>
+        </span>
         
         <div class="oe_mail_msg">
              <t t-if="record.subject">
-- 
cgit v1.2.3


From b821d42061465fe6f49449cecc2e87c2b57079da Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 21 Jun 2012 17:00:02 +0200
Subject: [IMP] properly prefix templates names with 'mail.' use 'main' and
 'aside' instead of 'left' and 'right' in the mail main boxes' class names

bzr revid: abo@openerp.com-20120621150002-u7saes5bc06bt51l
---
 addons/mail/static/src/xml/mail.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a5d669a4f00..7f74f3f5d80 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="Wall" class="oe_mail_wall">
+    <div t-name="mail.Wall" class="oe_mail_wall">
         <table class="oe_view_manager_header">
             <tr class="oe_header_row">
                 <td><h2 class="oe_view_title">All Feeds</h2></td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
         </table>
-        <div class="oe_mail_wall_left">
-            <div class="oe_mail_wall_act">
+        <div class="oe_mail_wall_main">
+            <div class="oe_mail_wall_action">
                 <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
@@ -21,13 +21,13 @@
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
         </div>
-        <div class="oe_mail_wall_right"></div>
+        <div class="oe_mail_wall_aside"></div>
     </div>
 
-    <t t-name="WallThreadContainer">
+    <t t-name="mail.WallThreadContainer">
     </t>
 
-    <div t-name="RecordThread" class="oe_mail_recthread">
+    <div t-name="mail.RecordThread" class="oe_mail_recthread">
         <h4>History and Comments</h4>
         <div class="oe_mail_recthread_left"></div>
         <div class="oe_mail_recthread_right">
@@ -43,8 +43,8 @@
         </div>
     </div>
 
-    <div t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
+    <div t-name="mail.Thread" class="oe_mail oe_mail_thread">
+        <div class="oe_mail_thread_action">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
-- 
cgit v1.2.3


From ad71e2a6809c1a97101cb44160f12bb1daeddfb1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 21 Jun 2012 18:18:53 +0200
Subject: [ADD] mail.group form view (from tde's branch)

bzr revid: abo@openerp.com-20120621161853-0vyfyt8rwdh4v8d0
---
 addons/mail/static/src/xml/mail.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f74f3f5d80..b005a471cdc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -94,10 +94,8 @@
             <p class="oe_mail_msg_subtitle">
                 <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>
-                 · 
                 <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
             </p>
             
@@ -108,9 +106,9 @@
             
             <ul class="oe_mail_msg_footer">
               <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply">Reply</a> · </li>
+                <li><a href="#" class="oe_mail_msg_reply">Reply</a></li>
               </t>
-              <li><a href="#">Like</a> · </li>
+              <li><a href="#">Like</a></li>
               <t t-if="record.attachment_ids.length > 0">
                 <li>
                     <a href="#" class="oe_mail_msg_view_attachments">
-- 
cgit v1.2.3


From c89c01929b55af3639fb2fd7448ee20280cf2bba Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 21 Jun 2012 23:55:27 +0200
Subject: [FIX] cleanups

bzr revid: al@openerp.com-20120621215527-5f05axqf9t1gnc8e
---
 addons/mail/static/src/xml/mail.xml | 122 ++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 69 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b005a471cdc..4b6898f319b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -28,7 +28,6 @@
     </t>
 
     <div t-name="mail.RecordThread" class="oe_mail_recthread">
-        <h4>History and Comments</h4>
         <div class="oe_mail_recthread_left"></div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
@@ -57,82 +56,67 @@
     </div>
 
     <!-- default layout -->
-    <div t-name="mail.Thread.default" class="oe_mail oe_mail_thread_msg">
+    <div t-name="mail.Thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
-            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_email_icon oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-call="mail.Thread.default.NoteDisplay"/>
-            </div>
-            <t t-if="record.type == 'tmp'"><t t-call="mail.Thread.default.ThreadDisplay"/></t>
-        </div>
-    </div>
-
-    <t t-name="mail.Thread.default.NoteDisplay">
-        <span class="oe_dropdown_toggle oe_dropdown_arrow">
-            <ul class="oe_dropdown_menu">
-                <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>
+                <span class="oe_dropdown_toggle oe_dropdown_arrow">
+                    <ul class="oe_dropdown_menu">
+                        <t t-if="thread._is_author(record.user_id[0]) &amp;&amp; display['show_delete']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></li>
+                        </t>
+                        <t t-if="!thread._is_author(record.user_id[0]) &amp;&amp; display['show_hide']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></li>
+                        </t>
+                    </ul>
+                </span>
+                
+                <div class="oe_mail_msg">
+                     <t t-if="record.subject">
+                        <h1 class="oe_mail_msg_title">
+                            <a href="#" class="oe_mail_internal_link"><t t-raw="record.subject"/></a>
+                        </h1>
                     </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>
+                    
+                    <p class="oe_mail_msg_subtitle">
+                        <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>
+                        <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
+                    </p>
+
+                    <div class="oe_mail_msg_body"><t t-raw="record.body"/></div>
+                    <t t-if="record.tr_body">
+                        <div class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></div>
                     </t>
-                </t>
-            </ul>
-        </span>
-        
-        <div class="oe_mail_msg">
-             <t t-if="record.subject">
-                <h1 class="oe_mail_msg_title">
-                    <a href="#" class="oe_mail_internal_link"><t t-raw="record.subject"/></a>
-                </h1>
-            </t>
-            
-            <p class="oe_mail_msg_subtitle">
-                <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>
-                <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
-            </p>
-            
-            <div class="oe_mail_msg_body"><t t-raw="record.body"/></div>
-            <t t-if="record.tr_body">
-                <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">Reply</a></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">
+
+                    <ul class="oe_mail_msg_footer">
+                      <t t-if="display['show_reply']">
+                        <li><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      </t>
+                      <li><a href="#">Like</a></li>
+                      <t t-if="record.attachment_ids.length > 0">
                         <li>
-                            <a t-att-href="attachment.url">
-                                <t t-raw="attachment.name"/>
+                            <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 t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
+                            </t>
+                        </ul>
                     </t>
-                </ul>
-            </t>
+                </div>
+            </div>
         </div>
-    </t>
+    </div>
+
 
 </template>
-- 
cgit v1.2.3


From 3821fcc47f223b787111f526cd8838515b1544da Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 22 Jun 2012 03:21:02 +0200
Subject: [IMP] mail layout simplications

bzr revid: al@openerp.com-20120622012102-ysfvjdj2jkhshuwq
---
 addons/mail/static/src/xml/mail.xml | 55 ++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 4b6898f319b..5ff8a996116 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,42 +68,35 @@
                         <t t-if="!thread._is_author(record.user_id[0]) &amp;&amp; display['show_hide']">
                             <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></li>
                         </t>
+                        <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
-                
                 <div class="oe_mail_msg">
-                     <t t-if="record.subject">
-                        <h1 class="oe_mail_msg_title">
-                            <a href="#" class="oe_mail_internal_link"><t t-raw="record.subject"/></a>
-                        </h1>
-                    </t>
-                    
-                    <p class="oe_mail_msg_subtitle">
-                        <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>
+                    <h1 t-if="record.subject &amp;&amp; record.subject != 'Reply'" class="oe_mail_msg_title">
+                        <t t-raw="record.subject"/>
+                    </h1>
+                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
+                        <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>
+                    </div>
+                    <div class="oe_mail_msg_body">
+                        <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>
+                        <t t-raw="record.body_head"/>
+                        <t t-if="record.body_tail"><a href="#" class="oe_mail_msg_more">... See more</a>
+                            <span class="oe_mail_msg_tail"><t t-raw="record.body_tail"/></span>
                         </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>
-                        <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
-                    </p>
-
-                    <div class="oe_mail_msg_body"><t t-raw="record.body"/></div>
-                    <t t-if="record.tr_body">
-                        <div class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></div>
-                    </t>
-
+                    </div>
                     <ul class="oe_mail_msg_footer">
-                      <t t-if="display['show_reply']">
-                        <li><a href="#" class="oe_mail_msg_reply">Reply</a></li>
-                      </t>
+                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      <!-- uncomment when merging vote
                       <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>
+                      -->
+                      <li t-if="record.attachment_ids.length > 0">
+                          <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>
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>
@@ -117,6 +110,4 @@
             </div>
         </div>
     </div>
-
-
 </template>
-- 
cgit v1.2.3