From de47c4cb526af08382eda3ccb945256682b54337 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:03:27 +0200
Subject: [PATCH] [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017150327-eo8z8kqaa2dnoc10
---
 addons/mail/static/src/js/mail.js   | 8 ++++----
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6b39fae8dd8..02b8479b0fc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -881,9 +881,9 @@ openerp.mail = function(session) {
             });
 
             if(this.datasets.thread_level){
-                this.ComposeMessage.prependTo(this.$el);
-            } else {
                 this.ComposeMessage.appendTo(this.$el);
+            } else {
+                this.ComposeMessage.prependTo(this.$el);
             }
         },
 
@@ -1142,11 +1142,11 @@ openerp.mail = function(session) {
                 if(sort){
                     message.insertBefore(parent_older.$el);
                 } else {
-                    message.insertAfter(parent_older.thread.$el);
+                    message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
                 }
             } else if(parent_newer){
                 if(sort){
-                    message.insertAfter(parent_newer.thread.$el);
+                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
                 } else {
                     message.insertBefore(parent_newer.$el);
                 }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 470478c0c21..03603b65a49 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -178,7 +178,7 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <span class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></span>
+                    <t t-call="mail.thread.message.star"/>
                     <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
                     <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
                     <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>