From 910ae6cba950b21c94f57f40ded2d9a922a9294e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Aug 2013 16:09:08 +0200
Subject: Created chat common javascript module/css/template file

bzr revid: nicolas.vanhoren@openerp.com-20130819140908-iai1e58wh7ofb7tp
---
 addons/im/static/src/xml/im_common.xml | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 addons/im/static/src/xml/im_common.xml

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

diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
new file mode 100644
index 00000000000..df5b90cce08
--- /dev/null
+++ b/addons/im/static/src/xml/im_common.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+<t t-name="conversation">
+    <div class="oe_im_chatview_header">
+        <img t-att-src="to_url('im/static/src/img/green.png')" class="oe_im_chatview_online"/>
+        <t t-esc="widget.user.get('name') || _t('You')"/>
+        <button class="oe_im_chatview_close">×</button>
+    </div>
+    <div class="oe_im_chatview_disconnected">
+        <t t-esc='widget.user.get("name") + _t(" is offline. He/She will receive your messages on his/her next connection.")'/>
+    </div>
+    <div class="oe_im_chatview_content">
+        <div></div>
+    </div>
+    <div class="oe_im_chatview_footer">
+        <input class="oe_im_chatview_input" t-att-placeholder="widget.inputPlaceholder" />
+    </div>
+</t>
+
+<t t-name="conversation_bubble">
+    <div class="oe_im_chatview_bubble">
+        <div class="oe_im_chatview_clip">
+            <img class="oe_im_chatview_avatar" t-att-src="user.get('image_url')"/>
+        </div>
+        <div class="oe_im_chatview_from"><t t-esc="user.get('name') || _t('You')"/></div>
+        <div class="oe_im_chatview_bubble_list">
+            <t t-foreach="items" t-as="item">
+                <div class="oe_im_chatview_bubble_item"><t t-esc="item"/></div>
+            </t>
+        </div>
+        <div class="oe_im_chatview_time"><t t-esc="time"/></div>
+    </div>
+</t>
+
+<t t-name="chatButton">
+    <t t-esc="widget.text"/>
+</t>
+</templates>
\ No newline at end of file
-- 
cgit v1.2.3


From c2366d71810ea4a2860f75dbd482dd12649318a8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Aug 2013 16:21:39 +0200
Subject: Put ChatButton in livechat

bzr revid: nicolas.vanhoren@openerp.com-20130819142139-mvh25k95k1wbjtzv
---
 addons/im/static/src/xml/im_common.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
index df5b90cce08..f4acd6762b1 100644
--- a/addons/im/static/src/xml/im_common.xml
+++ b/addons/im/static/src/xml/im_common.xml
@@ -32,8 +32,4 @@
         <div class="oe_im_chatview_time"><t t-esc="time"/></div>
     </div>
 </t>
-
-<t t-name="chatButton">
-    <t t-esc="widget.text"/>
-</t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From d60c2a5f7e032d7636caef1bb17b5e893efd6e7c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Aug 2013 14:15:22 +0200
Subject: Some cleaning

bzr revid: nicolas.vanhoren@openerp.com-20130820121522-en3bft0wotfnsozm
---
 addons/im/static/src/xml/im_common.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
index f4acd6762b1..c8421552a48 100644
--- a/addons/im/static/src/xml/im_common.xml
+++ b/addons/im/static/src/xml/im_common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <templates>
-<t t-name="conversation">
+<t t-name="im_common.conversation">
     <div class="oe_im_chatview_header">
         <img t-att-src="to_url('im/static/src/img/green.png')" class="oe_im_chatview_online"/>
         <t t-esc="widget.user.get('name') || _t('You')"/>
@@ -18,7 +18,7 @@
     </div>
 </t>
 
-<t t-name="conversation_bubble">
+<t t-name="im_common.conversation_bubble">
     <div class="oe_im_chatview_bubble">
         <div class="oe_im_chatview_clip">
             <img class="oe_im_chatview_avatar" t-att-src="user.get('image_url')"/>
-- 
cgit v1.2.3


From 124b93b0c10e58a5d8cf6b81088a2a585337707e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Aug 2013 16:41:47 +0200
Subject: Fixed a lot of stuff to make it work again in live support

bzr revid: nicolas.vanhoren@openerp.com-20130820144147-gnc26ul3ql86qfzs
---
 addons/im/static/src/xml/im.xml        | 33 ---------------------------------
 addons/im/static/src/xml/im_common.xml |  5 +++--
 2 files changed, 3 insertions(+), 35 deletions(-)

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

diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml
index 795d1b3e698..1acb538db4f 100644
--- a/addons/im/static/src/xml/im.xml
+++ b/addons/im/static/src/xml/im.xml
@@ -27,37 +27,4 @@
             <img t-att-src="_s +'/im/static/src/img/green.png'" class="oe_im_user_online"/>
         </div>
     </t>
-    <t t-name="Conversation">
-        <div class="oe_im_chatview">
-            <div class="oe_im_chatview_header">
-                <img t-att-src="_s +'/im/static/src/img/green.png'" class="oe_im_chatview_online"/>
-                <t t-esc="widget.user.get('name') || 'Anonymous'"/>
-                <scan class="oe_im_chatview_nbr_messages" />
-                <button class="oe_im_chatview_close">×</button>
-            </div>
-            <div class="oe_im_chatview_disconnected">
-                <t t-esc='_.str.sprintf(_t("%s is offline. He/She will receive your messages on his/her next connection."), widget.user.get("name") || "Anonymous")'/>
-            </div>
-            <div class="oe_im_chatview_content">
-                <div></div>
-            </div>
-            <div class="oe_im_chatview_footer">
-                <input class="oe_im_chatview_input" t-att-placeholder="_t('Say something...')" />
-            </div>
-        </div>
-    </t>
-    <t t-name="Conversation.bubble">
-        <div class="oe_im_chatview_bubble">
-            <div class="oe_im_chatview_clip">
-                <img class="oe_im_chatview_avatar" t-att-src='user.get("image_url")'/>
-            </div>
-            <div class="oe_im_chatview_from"><t t-esc="user.get('name') || 'Anonymous'"/></div>
-            <div class="oe_im_chatview_bubble_list">
-                <t t-foreach="items" t-as="item">
-                    <div class="oe_im_chatview_bubble_item"><t t-esc="item"/></div>
-                </t>
-            </div>
-            <div class="oe_im_chatview_time"><t t-esc="time"/></div>
-        </div>
-    </t>
 </templates>
\ No newline at end of file
diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
index c8421552a48..0ef8040d8c5 100644
--- a/addons/im/static/src/xml/im_common.xml
+++ b/addons/im/static/src/xml/im_common.xml
@@ -4,7 +4,8 @@
 <t t-name="im_common.conversation">
     <div class="oe_im_chatview_header">
         <img t-att-src="to_url('im/static/src/img/green.png')" class="oe_im_chatview_online"/>
-        <t t-esc="widget.user.get('name') || _t('You')"/>
+        <t t-esc="widget.user.get('name')"/>
+        <scan class="oe_im_chatview_nbr_messages" />
         <button class="oe_im_chatview_close">×</button>
     </div>
     <div class="oe_im_chatview_disconnected">
@@ -23,7 +24,7 @@
         <div class="oe_im_chatview_clip">
             <img class="oe_im_chatview_avatar" t-att-src="user.get('image_url')"/>
         </div>
-        <div class="oe_im_chatview_from"><t t-esc="user.get('name') || _t('You')"/></div>
+        <div class="oe_im_chatview_from"><t t-esc="user.get('name')"/></div>
         <div class="oe_im_chatview_bubble_list">
             <t t-foreach="items" t-as="item">
                 <div class="oe_im_chatview_bubble_item"><t t-esc="item"/></div>
-- 
cgit v1.2.3


From d756dc5977130a1bde68d47febc725b4cf14ac0a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Aug 2013 16:48:43 +0200
Subject: Removed to_url

bzr revid: nicolas.vanhoren@openerp.com-20130820144843-yeny7kpv1qcqijl9
---
 addons/im/static/src/xml/im_common.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
index 0ef8040d8c5..4286d0c9710 100644
--- a/addons/im/static/src/xml/im_common.xml
+++ b/addons/im/static/src/xml/im_common.xml
@@ -3,7 +3,7 @@
 <templates>
 <t t-name="im_common.conversation">
     <div class="oe_im_chatview_header">
-        <img t-att-src="to_url('im/static/src/img/green.png')" class="oe_im_chatview_online"/>
+        <img t-att-src="to_url('/im/static/src/img/green.png')" class="oe_im_chatview_online"/>
         <t t-esc="widget.user.get('name')"/>
         <scan class="oe_im_chatview_nbr_messages" />
         <button class="oe_im_chatview_close">×</button>
-- 
cgit v1.2.3