From 40b1c95e1a0932f4d1f87bf9894a169b2c9e57ff Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 20 Dec 2012 13:31:22 +0100
Subject: [IMP]mail: display checkbox for allow to add email (from email_from
 value) for creating partner and send email to this new partners.

bzr revid: chm@openerp.com-20121220123122-qsqn8w97t1tre3cq
---
 addons/mail/static/src/xml/mail.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 3c510813029..168f32a9d7e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -27,6 +27,11 @@
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
+                    <div class="oe_emails_from" t-if="widget.emails_from.length">
+                        <t t-foreach='widget.emails_from' t-as='email_from'>
+                            <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+                        </t>
+                    </div>
                     <textarea class="field_text"></textarea>
                 </div>
                 <div class="oe_msg_footer">
@@ -79,7 +84,7 @@
                         <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -91,7 +96,7 @@
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
-- 
cgit v1.2.3


From 4b930b2e4ae94a70788a7a8ad1cbd3b8e3afc771 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 20 Dec 2012 16:47:29 +0100
Subject: [IMP] mail: author is not a link if is not a partner

bzr revid: chm@openerp.com-20121220154729-eqrruc3uz5xjj4s2
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 168f32a9d7e..b8dce7f3468 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -237,8 +237,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id and widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-                    <span t-if="widget.author_id and !widget.options.show_link"><t t-raw="widget.author_id[1]"/></span>
+                    <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-if="widget.author_id and (!widget.options.show_link or widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
-- 
cgit v1.2.3


From d3e8a3ddeafe39174fac529f8501ff40b3441da3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 20 Dec 2012 16:55:58 +0100
Subject: [IMP] mail: display author at recipients on compose message

bzr revid: chm@openerp.com-20121220155558-9pihqxo35koaitp6
---
 addons/mail/static/src/xml/mail.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 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 b8dce7f3468..c3be27d8191 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -126,6 +126,11 @@
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
                 </span><t t-set="inc" t-value="inc+1"/>
             </t>
+
+            <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
+            <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+            <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
+
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
@@ -238,7 +243,7 @@
                         <div class="oe_msg_attachment_list"></div>
                     </t>
                     <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-                    <span t-if="widget.author_id and (!widget.options.show_link or widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
+                    <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
-- 
cgit v1.2.3


From e9d8ae79ca3e402ca5b1bc88edadb1aa647452fe Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Dec 2012 09:19:16 +0100
Subject: [IMP] mail: add a qweb tag for display author

bzr revid: chm@openerp.com-20121221081916-r1gkknu7estwg2kw
---
 addons/mail/static/src/xml/mail.xml | 12 ++++++------
 1 file changed, 6 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 c3be27d8191..ccedc6aca2d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -118,7 +118,7 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+            <t t-if="!widget.is_private and (widget.partner_ids.length || widget.author_id)"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
                 <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
@@ -126,11 +126,11 @@
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
                 </span><t t-set="inc" t-value="inc+1"/>
             </t>
-
-            <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
-            <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-            <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
-
+            <t t-if="widget.author_id">
+                <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
+                <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
+            </t>
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
-- 
cgit v1.2.3


From bfa8c20431c934b52b755c5f124f23d732fd71fd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Dec 2012 09:54:58 +0100
Subject: [IMP] mail: display author in recipients

bzr revid: chm@openerp.com-20121221085458-nrofy50r8ruuszag
---
 addons/mail/static/src/xml/mail.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 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 ccedc6aca2d..351e762c2f4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -27,11 +27,6 @@
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
-                    <div class="oe_emails_from" t-if="widget.emails_from.length">
-                        <t t-foreach='widget.emails_from' t-as='email_from'>
-                            <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
-                        </t>
-                    </div>
                     <textarea class="field_text"></textarea>
                 </div>
                 <div class="oe_msg_footer">
@@ -119,6 +114,11 @@
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length || widget.author_id)"> and </t>
+            <t t-if="widget.author_id">
+                <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
+                <t t-if="widget.partner_ids.length" t-raw="', '"/>
+            </t>
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
                 <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
@@ -126,16 +126,16 @@
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
                 </span><t t-set="inc" t-value="inc+1"/>
             </t>
-            <t t-if="widget.author_id">
-                <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
-                <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-                <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
-            </t>
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
             </t>
         </div>
+        <div class="oe_emails_from" t-if="widget.emails_from.length">
+            <t t-foreach='widget.emails_from' t-as='email_from'>
+                <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+            </t>
+        </div>
     </t>
 
     <!-- 
-- 
cgit v1.2.3


From f080e91168861bc2b404a126029f625e1bb84d3e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Dec 2012 12:14:00 +0100
Subject: [IMP] mail: add message 'Add this contact's email on recipient and
 follower'

bzr revid: chm@openerp.com-20121221111400-ngc62hepbgzqepy8
---
 addons/mail/static/src/xml/mail.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 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 351e762c2f4..f878b4204f1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -113,8 +113,8 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and (widget.partner_ids.length || widget.author_id)"> and </t>
-            <t t-if="widget.author_id">
+            <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
+            <t t-if="widget.author_id and widget.author_id[0]">
                 <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
                 <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
                 <t t-if="widget.partner_ids.length" t-raw="', '"/>
@@ -132,6 +132,7 @@
             </t>
         </div>
         <div class="oe_emails_from" t-if="widget.emails_from.length">
+            Add this contact's email on recipient and follower : 
             <t t-foreach='widget.emails_from' t-as='email_from'>
                 <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
             </t>
-- 
cgit v1.2.3


From 8972f7b334a569da26670040f19b7f793c1d2cd0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Dec 2012 13:11:44 +0100
Subject: [IMP] mail: check if the new email recipient already exist or not,
 and fix _api

bzr revid: chm@openerp.com-20121221121144-o8pbya2rc7v471y0
---
 addons/mail/static/src/xml/mail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 f878b4204f1..41de6d6b40f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -132,9 +132,8 @@
             </t>
         </div>
         <div class="oe_emails_from" t-if="widget.emails_from.length">
-            Add this contact's email on recipient and follower : 
             <t t-foreach='widget.emails_from' t-as='email_from'>
-                <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+                <label title="Add them into recipients and followers"><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
             </t>
         </div>
     </t>
-- 
cgit v1.2.3


From f922d9ea1f8124fe7785d8817397c7284e9ee0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Dec 2012 15:40:14 +0100
Subject: [IMP] mail: refactored a bit the code in message_post_user_api, as
 well as overrides in res_partner and res_users, to use kwargs. Updated
 mail.js to use kwargs. Updated mail.xml and css to tweak the display.

bzr revid: tde@openerp.com-20121221144014-otg03akq4c9grjmz
---
 addons/mail/static/src/xml/mail.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 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 41de6d6b40f..5401675b0f1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -114,26 +114,23 @@
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
-            <t t-if="widget.author_id and widget.author_id[0]">
-                <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-                <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
-                <t t-if="widget.partner_ids.length" t-raw="', '"/>
-            </t>
-            <t t-set="inc" t-value="0"/>
-            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
+            <t t-foreach="widget.partner_ids" t-as="partner">
                 <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
                     <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
-                </span><t t-set="inc" t-value="inc+1"/>
+                </span><t t-set="inc" t-value="(inc or 0)+1"/>
             </t>
-            <t t-if="widget.partner_ids.length>=3">
-                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
+            <t t-if="widget.partner_ids.length > 3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
             </t>
         </div>
-        <div class="oe_emails_from" t-if="widget.emails_from.length">
+        <div class="oe_emails_from">
             <t t-foreach='widget.emails_from' t-as='email_from'>
-                <label title="Add them into recipients and followers"><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+                <label title="Add them into recipients and followers">
+                    <input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/>
+                    <t t-raw="email_from[0]"/>
+                </label>
             </t>
         </div>
     </t>
-- 
cgit v1.2.3


From f9763f5d05166b91962a1a88e97b4a401349e3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Dec 2012 16:30:07 +0100
Subject: [IMP] mail.js, xml: misc cleaning. I hate JS.

bzr revid: tde@openerp.com-20121221153007-5o220hdqg9sbt3f3
---
 addons/mail/static/src/xml/mail.xml | 4 +++-
 1 file changed, 3 insertions(+), 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 5401675b0f1..4b3c31525d4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -114,11 +114,13 @@
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
+            <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
                 <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
                     <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
-                </span><t t-set="inc" t-value="(inc or 0)+1"/>
+                </span>
+                <t t-set="inc" t-value="inc+1"/>
             </t>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
-- 
cgit v1.2.3