From 73cf8d29f9209c8adfcbed97248f6bcaaa220f41 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 5 Mar 2013 18:24:42 +0530
Subject: [IMP] Added EDIT button in message_followers template for editing the
 subtypes of the users.

bzr revid: psa@tinyerp.com-20130305125442-z8h470slga4d77ll
---
 addons/mail/static/src/xml/mail_followers.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 459f13155a0..c22d253b1f7 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,6 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 7c5ddd2de0ead278c488fb380992a7a344b4c916 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 6 Mar 2013 16:48:54 +0530
Subject: [IMP]Placed edit image in place of edit link and improved css.

bzr revid: psa@tinyerp.com-20130306111854-d95kiof2o4apc8ns
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index c22d253b1f7..1e88deb7960 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 14317130c38bb254de5398c40847d293b9f51b32 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 8 Mar 2013 12:50:39 +0530
Subject: [IMP] added method for checking the group technical features is added
 or not.

bzr revid: psa@tinyerp.com-20130308072039-6iau8anuckonc6ps
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 1e88deb7960..18404c4ec05 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 0b62a6858f52a6d2e3edfaabdb64a71d2e0686fa Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 15:59:49 +0530
Subject: [IMP] 1) Added code for opening the dialog box of edit followers, 2)
 Added an image in the mail.message.subtype template which is visible when the
 Technical Features menu is selected true . 3) On clicking on the edit pencil
 which is with the followers name gives the subtypes of the specific followers
 on which the user had clicked rather than the current form.

bzr revid: psa@tinyerp.com-20130314102949-4v9l6xpz5u1jeq10
---
 addons/mail/static/src/xml/mail_followers.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 18404c4ec05..7721b1beb22 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From f242c87c7e182dbe011bedb74b0fbfdecf89336a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 19:11:22 +0530
Subject: [IMP] Now partner name is displayed as per the record and  added a
 new template.

bzr revid: psa@tinyerp.com-20130314134122-gedt3b9eq5kolnlt
---
 addons/mail/static/src/xml/mail_followers.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7721b1beb22..071205803bb 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -50,6 +50,15 @@
         </table>
     </t>
 
+    <t t-name="mail.followers.edit.subtype">
+        <table class='oe_subtype'>
+            <tr>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+            </tr>
+        </table>
+    </t>
+
     <t t-name="mail.followers.show_more">
         <div class="oe_partner oe_show_more">And <t t-raw="number"/> more.</div>
     </t>
-- 
cgit v1.2.3


From 90868a808903c8f5812a4243092a448752f25100 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 14:22:45 +0530
Subject: [IMP] Add method for the apply button when the user click on the
 apply button of the dialog box the data will be updated Removed unwanted code
 and clean the code.

bzr revid: psa@tinyerp.com-20130315085245-uhefj63na5z62of5
---
 addons/mail/static/src/xml/mail_followers.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 071205803bb..7a615044af1 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,8 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
@@ -53,7 +52,7 @@
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
                 <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
-- 
cgit v1.2.3


From cf3415f0877affc7f26ad16cd6a47ba671a9d601 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 19 Mar 2013 13:03:19 +0530
Subject: [IMP]Changed the position of methods and improved code.

bzr revid: psa@tinyerp.com-20130319073319-8myj2hx5iaqmi5xj
---
 addons/mail/static/src/xml/mail_followers.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 4a492cee713..ea11c26570b 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -48,6 +48,10 @@
         </table>
     </t>
 
+    <!--
+        followers.edit.subtype template
+        Template used to edit the display message subtypes of a follower subscription
+    -->
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>
-- 
cgit v1.2.3


From e9065f77273a544c99b546bf58201ee9c08b4b73 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 21 Mar 2013 18:10:36 +0530
Subject: [IMP] Reduced code, deleted redundant code, deleted the edit template
 and used it in the existing by using 'mode' and improved code using the
 existing code and removed unwanted code.

bzr revid: psa@tinyerp.com-20130321124036-0s4pv3oivzesmjh5
---
 addons/mail/static/src/xml/mail_followers.xml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index ea11c26570b..6420046477c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -42,21 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
-            </tr>
-        </table>
-    </t>
-
-    <!--
-        followers.edit.subtype template
-        Template used to edit the display message subtypes of a follower subscription
-    -->
-    <t t-name="mail.followers.edit.subtype">
-        <table class='oe_subtype'>
-            <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
-                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>
-- 
cgit v1.2.3


From f1db1ed7783b664ac3b6cceb085edfdddb7b8ee2 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Fri, 22 Mar 2013 13:52:06 +0530
Subject: [IMP]Add method for checking the group technical features.

bzr revid: vja@tinyerp.com-20130322082206-x2490850o8qbkmk0
---
 addons/mail/static/src/xml/mail_followers.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 6420046477c..bdcfd1e048c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <t t-js="d">console.log("dsfsdfd",d)</t>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From bd6a436bbb04b8121e58ad8b547ba8d7c67c3584 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 22 Mar 2013 14:40:26 +0530
Subject: [IMP] Added css for the ' Close(X)' icon of the dialog box when the
 title size increases than overlap the title.

bzr revid: psa@tinyerp.com-20130322091026-m0eqoqnt1t2p184v
---
 addons/mail/static/src/xml/mail_followers.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index bdcfd1e048c..081111a9afd 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,6 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <t t-js="d">console.log("dsfsdfd",d)</t>
         <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
-- 
cgit v1.2.3


From 5a112d8fa2f34d978e2580d706aef82b8e704e44 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Mar 2013 17:16:34 +0100
Subject: [ADD] suggested groups

bzr revid: mat@openerp.com-20130328161634-1fcmj0s67bofc6ra
---
 addons/mail/static/src/xml/mail.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b26ef06f5e4..c7681181c6a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -195,6 +195,7 @@
           </tbody>
         </table>
         <div class="oe_mail-placeholder"></div>
+        <aside class="oe_mail_wall_aside"></aside>
     </div>
 
     <!--
@@ -320,7 +321,4 @@
         </a>
     </span>
 
-    <!-- mail.thread.message.star
-        Template used to display stared/unstared message in a mail.message
-    -->
 </template>
-- 
cgit v1.2.3


From 3af8beb2b91217d229617c7b154f9456b0cdf3ea Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 09:01:40 +0100
Subject: [ADD] suggestion js and xml files

bzr revid: mat@openerp.com-20130329080140-t99dzeaiwikwjpsm
---
 addons/mail/static/src/xml/suggestions.xml | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 addons/mail/static/src/xml/suggestions.xml

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..874226bb332
--- /dev/null
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <t t-name="mail.suggestions">
+        <div class="oe_suggestions_groups">No groups</div>
+    </t>
+
+    <!-- Suggested groups -->
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
+        <p class="oe_user_display">Suggested Groups</p>
+        <div class="oe_suggest_groups">
+            <t t-foreach="widget.suggestions" t-as="result">
+                <div class="oe_suggested_groups">
+                    <div class="oe_group_images">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img class="oe_group_image_content" t-attf-src="{result.image}"/>
+                        </a>
+                    </div>
+                    <div class="oe_group">
+                        <a class="oe_group_name" t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <t t-esc="result.name"/>
+                        </a>
+                        <a href="#" class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                            <span class="oe_kanban_action oe_kanban_action_a">X</span>
+                        </a>
+                        <br/>
+                        <button type="button" t-att-id="result.id" class="oe_join_group">Join Group</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+
+</template>
-- 
cgit v1.2.3


From 64dcc8db926e4c08959b3cd781467c7c43675035 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 11:12:44 +0200
Subject: [IMP] CSS tweaks

bzr revid: mat@openerp.com-20130403091244-l3snsoja4t8c41q6
---
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 874226bb332..515a3c2b497 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -7,7 +7,7 @@
 
     <!-- Suggested groups -->
     <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
-        <p class="oe_user_display">Suggested Groups</p>
+        <p class="oe_suggestion_display">Suggested Groups</p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_groups">
-- 
cgit v1.2.3


From 851e6c1f5a5d9a8b206e115760c7f2ae484341ce Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 14:24:08 +0200
Subject: [REF] cleaning js code

bzr revid: mat@openerp.com-20130403122408-fbbybeczf6xqwjvc
---
 addons/mail/static/src/xml/suggestions.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 515a3c2b497..35ef62d8acd 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -12,15 +12,13 @@
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_groups">
                     <div class="oe_group_images">
-                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
-                            <img class="oe_group_image_content" t-attf-src="{result.image}"/>
-                        </a>
+                        <img class="oe_group_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
                     </div>
                     <div class="oe_group">
-                        <a class="oe_group_name" t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                        <a class="oe_group_name oe_open_group" t-attf-id="{result.id}">
                             <t t-esc="result.name"/>
                         </a>
-                        <a href="#" class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                        <a class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
                             <span class="oe_kanban_action oe_kanban_action_a">X</span>
                         </a>
                         <br/>
-- 
cgit v1.2.3


From 8d8eb553ceac3b3c4ca037c442c7f1714c0d9a12 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 16:27:16 +0200
Subject: [ADD] suggestions for employees to follow

bzr revid: mat@openerp.com-20130403142716-lmsz9hwkg7tathly
---
 addons/mail/static/src/xml/suggestions.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 35ef62d8acd..949e421143c 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -10,19 +10,19 @@
         <p class="oe_suggestion_display">Suggested Groups</p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
-                <div class="oe_suggested_groups">
-                    <div class="oe_group_images">
-                        <img class="oe_group_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
+                <div class="oe_suggested_item">
+                    <div class="oe_item_image">
+                        <img class="oe_item_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
                     </div>
-                    <div class="oe_group">
-                        <a class="oe_group_name oe_open_group" t-attf-id="{result.id}">
+                    <div class="oe_item">
+                        <a class="oe_item_name oe_open_group" t-attf-id="{result.id}">
                             <t t-esc="result.name"/>
                         </a>
-                        <a class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                        <a class="oe_remove_suggested_item oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
                             <span class="oe_kanban_action oe_kanban_action_a">X</span>
                         </a>
                         <br/>
-                        <button type="button" t-att-id="result.id" class="oe_join_group">Join Group</button>
+                        <button t-att-id="result.id" class="oe_suggestion_action oe_join_group">Join Group</button>
                     </div>
                 </div>
             </t>
-- 
cgit v1.2.3


From 46110fbf2995f3a8104f3f08007db4cf43000a85 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 17:10:56 +0200
Subject: [ADD] option to globally stop showing group suggestions

bzr revid: mat@openerp.com-20130403151056-4vjno2k9n77drm6y
---
 addons/mail/static/src/xml/suggestions.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 949e421143c..1ebd2f6276c 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -6,8 +6,13 @@
     </t>
 
     <!-- Suggested groups -->
-    <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
-        <p class="oe_suggestion_display">Suggested Groups</p>
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
+        <p class="oe_suggestion_display">
+            Suggested Groups
+            <a class="oe_remove_suggestion oe_remove_suggestion_employees" rol="button">
+                <span class="oe_kanban_action oe_kanban_action_a">X</span>
+            </a>
+        </p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_item">
-- 
cgit v1.2.3


From 52ddce88f338d8c904efe6b652f1a236da2763fc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 17:24:43 +0200
Subject: [ADD] option to globally stop showing employeep suggestions

bzr revid: mat@openerp.com-20130403152443-3jqg0v182mcqsk0f
---
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 1ebd2f6276c..d90e6b12b03 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -9,7 +9,7 @@
     <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
         <p class="oe_suggestion_display">
             Suggested Groups
-            <a class="oe_remove_suggestion oe_remove_suggestion_employees" rol="button">
+            <a class="oe_remove_suggestion oe_remove_suggestion_groups" rol="button">
                 <span class="oe_kanban_action oe_kanban_action_a">X</span>
             </a>
         </p>
-- 
cgit v1.2.3


From 9a2a45c768b77fb829582f060221a90340445da1 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 14:17:24 +0530
Subject: [IMP] Improved code and removed unwanted code. As suggested by tde in
 his comment >>  **What's the purpose of defining a new 'check_access_right' ?
 Limiting to 'group_no_one' does not seems a viable solution. Instead, access
 rights on mail.followers entries should be correctly written (please check it
 is the case). I think having an asynchronous call just to check access rights
 is not necessary. In debug mode, always display the button.**

bzr revid: psa@tinyerp.com-20130404084724-meqsx35jdvk56z2c
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 081111a9afd..960c399ecce 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 5bbffbc39c899adb92d251a3c8ef7f06e39338a7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 11 Apr 2013 18:05:37 +0530
Subject: [IMP] Improved code and made the EDIT followers visible when
 'Technical Features' are given and it is in 'DEBUG mode'.

bzr revid: psa@tinyerp.com-20130411123537-2wzb468o7o0dno8c
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 88f38146de3..ca0064cbc78 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 67bffc62c4d443b2b4315b10c1872d136e3a18ef Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 17 Apr 2013 17:17:21 +0200
Subject: [IMP] clean code

bzr revid: mat@openerp.com-20130417151721-fmwd143gazkldvu3
---
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index d90e6b12b03..f868194ded6 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -2,7 +2,7 @@
 <template>
 
     <t t-name="mail.suggestions">
-        <div class="oe_suggestions_groups">No groups</div>
+        <div class="oe_suggestions_groups"></div>
     </t>
 
     <!-- Suggested groups -->
-- 
cgit v1.2.3


From 85a807a5153d357e83a0f01d4940b5c6c2582403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Apr 2013 17:36:45 +0200
Subject: [REF] Chatter: refactored system for read more / read less, now based
 on html_email_clean instead of the expander library.

bzr revid: tde@openerp.com-20130423153645-k8vcb9hiuapzf7sg
---
 addons/mail/static/src/xml/mail.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e7d772397a..9958cb5e595 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -254,7 +254,13 @@
                         <t t-if="widget.subject" t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-raw="widget.body"/>
+                        <t t-if="widget.body_short">
+                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/><span class="oe_mail_expand"><a href="#">... read more</a></span></div>
+                            <div class="oe_msg_body_long" style="display: none;"><t t-raw="widget.body"/><span class="oe_mail_reduce"><a href="#">read less</a></span></div>
+                        </t>
+                        <t t-if="! widget.body_short">
+                            <t t-raw="widget.body"/>
+                        </t>
                     </div>
                 </div>
                 <div class="oe_msg_footer">
-- 
cgit v1.2.3


From e0ea2dbdcb7af84f2f3bdab228bb4805ce9a56f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Apr 2013 12:43:36 +0200
Subject: [IMP] Chatter: first message is truncated after 100 characters, other
 messages after 300 characters; cleaned code about expan management.

bzr revid: tde@openerp.com-20130425104336-3xvdwgwanrutzinp
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9958cb5e595..dfbabcd1f89 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -255,7 +255,7 @@
                     </h1>
                     <div class="oe_msg_body">
                         <t t-if="widget.body_short">
-                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/><span class="oe_mail_expand"><a href="#">... read more</a></span></div>
+                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/></div>
                             <div class="oe_msg_body_long" style="display: none;"><t t-raw="widget.body"/><span class="oe_mail_reduce"><a href="#">read less</a></span></div>
                         </t>
                         <t t-if="! widget.body_short">
-- 
cgit v1.2.3


From 0525c965a9aa4f86d77c76ec272f864e3614ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 15 May 2013 12:35:18 +0200
Subject: [CLEAN] [REF] mail, hr: cleaned JS/CSS/XML code for suggestion
 widgets. Those are now 2 widgets extending web.Widget, included inside a
 Sidebar widget.

bzr revid: tde@openerp.com-20130515103518-2djzogjdtjh0n7rl
---
 addons/mail/static/src/xml/mail.xml        |  7 +++++
 addons/mail/static/src/xml/suggestions.xml | 42 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 21 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cfbe57aa1b6..d0f975e84d7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -198,6 +198,13 @@
         <aside class="oe_mail_wall_aside"></aside>
     </div>
 
+    <!--
+        Empty template that holds the sidebar of the Wall
+        -->
+    <t t-name="mail.wall.sidebar">
+        <div class="oe_mail_wall_sidebar"></div>
+    </t>
+
     <!--
         display message on the wall when there are no message
         -->
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index f868194ded6..9157dcbe32e 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <t t-name="mail.suggestions">
-        <div class="oe_suggestions_groups"></div>
+    <!-- Groups placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_groups"></div>
+        </t>
     </t>
 
+
     <!-- Suggested groups -->
-    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
-        <p class="oe_suggestion_display">
-            Suggested Groups
-            <a class="oe_remove_suggestion oe_remove_suggestion_groups" rol="button">
-                <span class="oe_kanban_action oe_kanban_action_a">X</span>
-            </a>
-        </p>
-        <div class="oe_suggest_groups">
-            <t t-foreach="widget.suggestions" t-as="result">
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_suggestion_group">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_group oe_e">X</a>
+            <h2>Suggested Groups</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.groups" t-as="result">
                 <div class="oe_suggested_item">
-                    <div class="oe_item_image">
-                        <img class="oe_item_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
-                    </div>
-                    <div class="oe_item">
-                        <a class="oe_item_name oe_open_group" t-attf-id="{result.id}">
-                            <t t-esc="result.name"/>
-                        </a>
-                        <a class="oe_remove_suggested_item oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
-                            <span class="oe_kanban_action oe_kanban_action_a">X</span>
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
                         </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=mail.group&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_group oe_e" t-attf-id="{result.id}">X</a>
                         <br/>
-                        <button t-att-id="result.id" class="oe_suggestion_action oe_join_group">Join Group</button>
+                        <button t-att-id="result.id" class="oe_suggestion_join">Join Group</button>
                     </div>
                 </div>
             </t>
-- 
cgit v1.2.3


From 89896f32bbf6aeecfbddc0f7e8397781fce2a99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 15 May 2013 17:31:59 +0200
Subject: [IMP] [CLEAN] [REF] mail, res_partner, res_users, hr: cleaned partner
 / employee profile following last specifications. Partner profile is now
 classic, no more email-routing. Writing on res.users, basically, begins a
 private discussion. With HR, emails on res.users are private discussions,
 other are post on employee profile. Some cleaning in Chatter about Followers
 of ... , now talking about partner or employee profile.

bzr revid: tde@openerp.com-20130515153159-cm52byvb7w6m1sxs
---
 addons/mail/static/src/xml/mail.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d0f975e84d7..1ee1af68fff 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -121,9 +121,11 @@
             To:
             <t t-if="!widget.is_private">
                 <span class="oe_all_follower">
-                    Followers of
-                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
-                    <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
+                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'">
+                        Followers of <t t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
+                    </t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
-- 
cgit v1.2.3


From 9fd2e7297ffb0fe9cb96767bcb8ad686a66d064b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Jun 2013 12:13:00 +0200
Subject: [IMP] Chatter: better display of date

bzr revid: tde@openerp.com-20130605101300-t1lwykg3d6lp7au2
---
 addons/mail/static/src/xml/mail.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f5004941a8d..b3b79bcfc43 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -295,7 +295,10 @@
                         notified
                     </t>
                     <span class='oe_subtle'>•</span>
-                    <span t-att-title="widget.date"><t t-if="widget.timerelative" t-raw="widget.timerelative"/><t t-if="!widget.timerelative" t-raw="widget.date"/></span>
+                    <span t-att-title="widget.date">
+                        <t t-if="widget.timerelative" t-raw="widget.timerelative"/>
+                        <t t-if="!widget.timerelative" t-raw="widget.display_date"/>
+                    </span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
                     <t t-if="!widget.options.readonly" t-call="mail.thread.message.vote"/>
                 </div>
-- 
cgit v1.2.3


From 9c57f6e1cdaf8a80a403486b51cd9e661c11e3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Jun 2013 12:24:37 +0200
Subject: [FIX] mail: various fixes Mass mailing: emails due to mass mailing
 are not queued instead of sent immediately. As most of cases go through
 mail_followers._notify(), a new argument is added that allows to control the
 force_send (like what is done in email_template). Chatter: better display of
 recipients when having a message_post due to mass mailing (not always
 displaying logged a note). Notified people: when having no subtype, just
 avoid notifying the followers but take into account specified recipients
 (partner_ids).

bzr revid: tde@openerp.com-20130606102437-43s4xp96b5wa3r1q
---
 addons/mail/static/src/xml/mail.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b3b79bcfc43..8c507925359 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -271,16 +271,16 @@
                             <span class='oe_subtle'>•</span>
                         </t>
                     </t>
-                    <t t-if="widget.type == 'comment' and ! widget.subtype">
+                    <t t-if="widget.type == 'comment' and ! widget.subtype and widget.partner_ids.length == 0">
                         logged a note
                     </t>
-                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype">
+                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and (widget.subtype or widget.partner_ids.length > 0)">
                         to
                         <t t-if="widget.partner_ids.length == 0">
                             nobody
                         </t>
                     </t>
-                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)"
+                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))"
                             t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
                         <span t-attf-class="oe_partner_follower">
                         <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-- 
cgit v1.2.3


From 14f157e395304c288e116e1759fdaf74128d8877 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 12 Jun 2013 17:15:38 +0530
Subject: [IMP] When the subtypes are not displayed in subtype list below the
 follow button than the edit subtype pencil will also not displayed.

bzr revid: psa@tinyerp.com-20130612114538-21ohwb0l50or62fe
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 876cead3b50..0693b7c9532 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From ae8302a3d6108d305c38190214b348a5e6715b7f Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 19 Jun 2013 19:18:17 +0530
Subject: [IMP] Now the edit_subtype pencil will be visible when the cursor
 goes on to the follower_list. And made the edit_subtype icon visible without
 debug mode.

bzr revid: psa@tinyerp.com-20130619134817-n390r4dsgmpo33nb
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 0693b7c9532..db58abb1441 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 670710b88eb596ab9f6e8587de3d43ac133c0e18 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 13:31:06 +0530
Subject: [IMP] Improved code and passed the data according to the format as
 suggest (partner_id, partner_name, {'is_editable': True/False, 'is_uid':
 True/False}) and done changes according this changes.

bzr revid: psa@tinyerp.com-20130715080106-63dbeh3mhgiqppzv
---
 addons/mail/static/src/xml/mail_followers.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index db58abb1441..d23154096a6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
+        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     
     <!--
-- 
cgit v1.2.3


From 21e3d7cdc49fb2bf700ae8a0baa2d54cb39ac4c4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 14:19:07 +0530
Subject: [IMP] 2 little improvements when their is no subtype than no
 edit_subtype pencil will be visible and bydefault set the message_is_follower
 to false because when no followers are there than subtypes muzt not be
 visible.

bzr revid: psa@tinyerp.com-20130715084907-nrd2oileuyr30nep
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index d23154096a6..7628cdae7da 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     
-- 
cgit v1.2.3


From 68d1c2928fc1d0307726ed4d32555d68c4f330c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Jul 2013 11:55:09 +0200
Subject: [CLEAN] Cleaning befor merging No need to use an image for edition ->
 use webtypo font instead Small code cleaning in js / python

bzr revid: tde@openerp.com-20130723095509-knp45uvmlfmr27v9
---
 addons/mail/static/src/xml/mail_followers.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7628cdae7da..a936b8237d6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
+        <span t-if="record.is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype oe_e oe_hidden" title="Edit subscription" t-att-data-id="record.id">&amp;</span>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
     <!--
@@ -42,8 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>
-- 
cgit v1.2.3