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 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 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