[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120611124702-f45l1i7kqzjs7sua

1 files changed, 43 insertions, 27 deletions

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 874cd406852..a34e362960b 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>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -59,7 +59,8 @@
 
     <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <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>
@@ -74,19 +75,27 @@
                 <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 />
-            <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>
-            <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> 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_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <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_msg_hide oe_mail_oe_intlink">Hide</a></t>
-            </t>
+            <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>
     
@@ -95,22 +104,29 @@
             <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>
-            <br />
-            <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>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-            <br />
-            <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_msg_delete oe_mail_oe_intlink"> Delete </a></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-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></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>
-        </p>
+          </t>
+          <li>
+            <span class="oe_fade"><t t-raw="record.date"/></span>
+          </li>
+        </ul>
     </t>
 
 </template>