diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-06-12 14:12:58 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-06-12 14:12:58 +0200 |
| commit | 43d08b898fc3a5c5d5eaec140e7acd3b7e7faf43 (patch) | |
| tree | 63506a148af90b389f29b0de689b01eff5bbeb74 /addons/mail/static/src/css | |
| parent | 70f16ce73b0dab305b9e7d63a74416cbcb0448da (diff) | |
| parent | 99dd06cfd0f87e0bdd6be402f85328f1006667aa (diff) | |
[MERGE] [IMP] 'Social Aspects' Task
Purpose:
- mail is now focused on messaging; partner document is now a classic document, without specific behavior; removed the concept of 'my followers' from mail;
- hr adds social features to mail: employee profile is used to display internal messages; employees can follow other employees, comment and react on their profile messages;
- display suggestion of Groups and Employees to follow in the Inbox, using a new widget. The purpose is to promote social interactions between employees and to improve the visibility of groups;
mail:
- add suggestions.Group widget that allows to display a list of suggested groups to follow; this widget is displayed in the Inbox;
- display 'Partner profile of' or 'News from' when reading messages from a partner profile / employee profile in the Inbox;
- 'Compose a new message or Write to my followers' is not present anymore when hr is not installed, because this social aspect comes with HR;
- mail_thread: add a search function on message_is_follower;
- mail_group: implement suggested groups behavior;
- res_partner: removed specific code changing message_post with type='email' to a private discussion between author and destination partner; partner document behaves like a classic document;
- res_users: add 'display_groups_suggestions' field that controls the display of suggested groups to follow;
- res_users: writing on a res.users object is considered as a private discussion; when Hr is not installed, only aliases should be able to post on a user;
hr_employee:
- when creating an employee, post a message on its profile and push it to every employees of the same company;
- add follow/unfollow and message and follower count on employee kanban view;
- implement suggested employee behavior;
- HR improves the basic Inbox by adding the 'Compose a new message or Write to my followers';
- allow to post on an employee profile when having read access right if the user that posts is an employee;
HR:
- add suggestions.Employee widget that allows to display a list of suggested employees to follow; this widget is displayed in the Inbox;
- res_users: add 'display_employees_suggestions' field that controls the display of suggested employees to follow;
- res_users: do not welcome new users anymore, welcome new employees instead
- res_users: incoming emails are still considered as private messages (using aliases); however messages posted on user profile are redirected to the related employee profiles (used for 'Write to my followers')
bzr revid: tde@openerp.com-20130612121258-j38do5opsot2ur7c
Diffstat (limited to 'addons/mail/static/src/css')
| -rw-r--r-- | addons/mail/static/src/css/mail.css | 66 | ||||
| -rw-r--r-- | addons/mail/static/src/css/mail_group.css | 1 |
2 files changed, 65 insertions, 2 deletions
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 958c2bccd5f..c969d3f3b16 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -22,7 +22,7 @@ width: 32px; height: 32px; padding: 0px; - margin: 0px + margin: 0px; border-radius: 0px; } @@ -665,8 +665,72 @@ .openerp .oe_mail_wall .oe_mail{ margin: 16px; width: 600px; + display: inline-block; } .openerp .oe_mail .oe_view_nocontent > p { padding-left: 15px; } + + +/* ------------- WALL SIDEBAR ------------- */ + +.openerp .oe_mail_wall .oe_mail_wall_aside { + margin: 16px; + position: relative; + display: inline-block; + vertical-align: top; + width: 260px; +} +.openerp .oe_mail_wall_aside .oe_sidebar_suggestion { + background-color: #EDEDF6; + border-radius: 2px; + padding-top: 1px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_title h2 { + font-size: 14px; + font-weight: bold; + margin-left: 10px; + padding: 0px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item { + border-radius: 2px; + width: 100%; + margin-left: 10px; + min-height: 67px; /* image_small 66x66px */ +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image { + float: left; + padding-right: 10px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image img { + border-radius: 2px; + border: solid 1px rgba(0,0,0,0.03); +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content button { + margin-top: 10px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_item_name { + text-overflow: ellipsis; + overflow: hidden; + width: 90%; +} +.openerp .oe_sidebar_suggestion .oe_suggest_title a.oe_suggestion_remove { + line-height: 15px; + margin-top: -2px; + float: right; + visibility: hidden; + margin-right: 7px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_remove_item { + line-height: 15px; + margin-top: -2px; + float: right; + visibility: hidden; + margin-right: 16px; +} +.openerp .oe_sidebar_suggestion .oe_suggest_title:hover a.oe_suggestion_remove, +.openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item { + visibility: visible; +} + diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css index 4f2b8a16dd0..9560a4765d0 100644 --- a/addons/mail/static/src/css/mail_group.css +++ b/addons/mail/static/src/css/mail_group.css @@ -48,7 +48,6 @@ text-align: center; overflow: hidden; -moz-border-radius: 3px; - border-collapse: separate; -webkit-border-radius: 3px; -o-border-radius: 3px; -ms-border-radius: 3px; |
