diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-09-11 13:07:55 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-09-11 13:07:55 +0200 |
| commit | c48504fdba1ef68033c5e6c3b7929ea4e153d4b7 (patch) | |
| tree | 471c4c37f5b76a4f034b5de805655d5fc5dcf867 /addons/im/static/src/xml | |
| parent | 9349ba848497b9c5b7ded809a4db6b1e3b26b6a6 (diff) | |
| parent | 3fa90321e11d28df4e2b874ddfa450dc73e8e0af (diff) | |
[MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
Diffstat (limited to 'addons/im/static/src/xml')
| -rw-r--r-- | addons/im/static/src/xml/im.xml | 33 | ||||
| -rw-r--r-- | addons/im/static/src/xml/im_common.xml | 42 |
2 files changed, 42 insertions, 33 deletions
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 new file mode 100644 index 00000000000..462e242befd --- /dev/null +++ b/addons/im/static/src/xml/im_common.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<templates> +<t t-name="im_common.conversation"> + <div class="oe_im_chatview_header"> + <span class="oe_im_chatview_users"/> + <scan class="oe_im_chatview_nbr_messages" /> + <button class="oe_im_chatview_close">×</button> + </div> + <div class="oe_im_chatview_disconnected"> + All users are offline. They will receive your messages on their 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="im_common.conversation.header"> + <span t-foreach="widget.get('users')" t-as="user"> + <img t-if="user.get('im_status')" t-att-src="to_url('/im/static/src/img/green.png')" class="oe_im_chatview_online"/> + <t t-esc="user.get('name')"/> + </span> +</t> + +<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')"/> + </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-raw="item"/></div> + </t> + </div> + <div class="oe_im_chatview_time"><t t-esc="time"/></div> + </div> +</t> +</templates>
\ No newline at end of file |