diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-02-08 16:25:21 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-02-08 16:25:21 +0100 |
| commit | cff98a3aeb4b2308d00dc4b91b283ab79e322c45 (patch) | |
| tree | f8ec8e719f0426365f2b05a6a21a2c72fc9a964f /addons/mail/static/src/xml/mail.xml | |
| parent | 74255533e141ea35b9780a3b63fcaf91e896c2db (diff) | |
[IMP] Improved ThreadView widget display; cleaned ThreadView widget js code; added basic access rules; added message_mark_done method to clean a mail.thread of its need_action_user_id; added auto-push of notifications if user requested to perform an action is not following the object; added first draft of messaging mechanism in hr_holidays
bzr revid: tde@openerp.com-20120208152521-68i4nekjj8mnuyc8
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 35eefe53f16..376e8042a06 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -1,33 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> <template> - <div t-name="ThreadView"> + <div t-name="ThreadView" class="oe_mail_main"> + <div class="separator horizontal">OpenSocial</div> <div class="oe_mail_actions"> <button type="button" class="oe_mail_action_follow">Follow</button> <button type="button" class="oe_mail_action_unfollow">Unfollow</button> </div> - <div class="oe_mail_comment"> + <div class="oe_mail_post_comment"> <textarea rows="3" cols="15">Type your comment</textarea><br /> <button type="button" class="oe_mail_action_comment">Post comment</button> </div> + <div class="oe_mail_comments"> + </div> </div> - <div t-name="ThreadMsgView"> - <div class="oe_mail_msg"> -<!-- <p style="border: 3px solid #332299;"> --> - zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef -<!-- </p> --> - <div class="oe_mail_msg_image">Image</div> - <div class="oe_mail_msg_content"> - <p class="oe_mail_msg_p"> - zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef -<!-- <t t-raw="record.body_text"/> --> -<!-- <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br /> --> -<!-- <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span><br /> --> -<!-- <span class="oe_mail_msg_date"><t t-raw="record.date"/></span> --> - </p> - </div> + <t t-name="ThreadMsgView"> + <div class="oe_mail_msg_image">Image</div> + <div class="oe_mail_msg_content"> + <p class="oe_mail_msg_p"> + <t t-if="record.type == 'notification'"> + <span class="oe_mail_msg_author">OpenERP System Notification</span> + </t> + <t t-if="record.type == 'comment'"> + <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span> + </t> + <t t-if="record.type == 'email'"> + <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span> + </t> + <t t-if="record.need_action_user_id != false">- <span class="oe_mail_msg_need_action">Need action</span></t> + <br /> + <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br /> + <span class="oe_mail_msg_date"><t t-raw="record.date"/></span> + </p> </div> - </div> + </t> </template>
\ No newline at end of file |