diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-02 16:46:54 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-02 16:46:54 +0200 |
| commit | 8fea9baa91c118fe07a7be235134c0faec3e7cd2 (patch) | |
| tree | dca48dcb4a48dd31da1b5ed5934045e67e0f3a9a /addons/share/static/src/xml | |
| parent | c8da73626e2340f7f4215b36c7e2b9ff11bb1948 (diff) | |
| parent | 0c86af17ab90c580106aec65d195a91b8710e75e (diff) | |
[MERGE] Merged branch some fixes and clean for chatter/share.Mail
- subject is not required anymore, leading to a better-looking Wall/Chatter
- defined a name_get because subject could be void
Mail group
- cleaned form view
Mail compose message
- cleaned the current form view
Share
- moved links to the More menu
- cleaned various views of the wizard
- fixed link send in the email for direct login
Invite
- cleaned style
- better integration with Portal option
Fetchmail
- fixed a bug due to a wrongly named variable (logger)
CRM
- lead view: chatter in a footer
Chatter
- use expander plugin for read more/read less.
bzr revid: tde@openerp.com-20120702144654-y9zt3vsh9dwje1rn
Diffstat (limited to 'addons/share/static/src/xml')
| -rw-r--r-- | addons/share/static/src/xml/share.xml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml index e51dc135c0b..1d9bc987afc 100644 --- a/addons/share/static/src/xml/share.xml +++ b/addons/share/static/src/xml/share.xml @@ -3,18 +3,11 @@ --> <templates id="template" xml:space="preserve"> - <t t-extend="ViewManagerAction"> - <t t-jquery=".oe_shortcuts_toggle" t-operation="after"> - <a class="oe_share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> - <a class="oe_share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> - </t> - </t> - - <t t-extend="RecordThread"> + <!-- Extends Chatter widget in form view to add the invite button --> + <t t-extend="mail.RecordThread"> <t t-jquery="button.oe_mail_button_unfollow" t-operation="after"> - <button type="button" class="oe_share_mail oe_mail_button_mouseout">Invite</button> + <button type="button" class="oe_share_invite">Invite</button> </t> </t> - </templates> |
