[MERGE] Merged wiht branch holding mail-state update; includes merge of trunk before commit with views update (up to 6882).

bzr revid: tde@openerp.com-20120608142440-fgpje1y42ik8wwkx
bzr revid: tde@openerp.com-20120611102254-weudj3vj18m26iej

1 files changed, 44 insertions, 31 deletions

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a2d47d0f64f..25c45a63dfb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,6 +10,7 @@
         </table>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
+                <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>
             </div>
@@ -38,8 +39,7 @@
             </div>
             <div class="oe_mail_recthread_followers">
                 <h4>Followers</h4>
-                <div class="oe_mail_followers_display">
-                </div>
+                <ul class="oe_mail_followers_display"></ul>
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
         <div class="oe_mail_thread_act">
             <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 = '';"/><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
             </div>
             <a href="#" class="oe_mail_compose oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
@@ -72,7 +72,8 @@
                     <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
-            <img class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
+            <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>
@@ -86,14 +87,8 @@
             <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><br />
-            <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>
-                on <t t-raw="record.date"/>
-            </span>
-            <span class="oe_right">
-                <t t-call="MessageDisplayManageLinks"/>
-            </span>
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-call="MessageDisplayManageLinks"/>
         </p>
     </t>
     
@@ -102,31 +97,49 @@
             <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_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
-            <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
-            <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
         </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><br />
-            <span class="oe_right">
-                <t t-call="MessageDisplayManageLinks"/>
-            </span>
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-call="MessageDisplayManageLinks"/>
         </p>
     </t>
 
     <t t-name="MessageDisplayManageLinks">
-        <t t-if="display['show_reply']">
-            <a href="#" class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply">Reply</a>
-        </t>
-        <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_delete">Delete</a>
-        </t></t>
-        <t t-if="display['show_hide']">
-            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
-        </t>
-        <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
-            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
-        </t></t>
+        <ul>
+            <t t-if="display['show_reply']">
+                <li>
+                    <a href="#" class="oe_mail_oe_intlink oe_mail_msg_reply">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_oe_intlink oe_mail_msg_delete">Delete</a>
+                    <span class="oe_mail_oe_space oe_fade"> · </span>
+                </li>
+            </t></t>
+            <t t-if="display['show_hide']">
+                <li>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
+                    <span class="oe_mail_oe_space oe_fade"> · </span>
+                </li>
+            </t>
+            <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
+                <li>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
+                    <span class="oe_mail_oe_space oe_fade"> · </span>
+                </li>
+            </t></t>
+            <li>
+                <span class="oe_fade"><t t-raw="record.date"/>
+                <t t-if="record.type != 'email'">
+                    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>
+                </t>
+                </span>
+            </li>
+        </ul>
     </t>
 
 </template>