diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-03-28 17:16:34 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-03-28 17:16:34 +0100 |
| commit | 5a112d8fa2f34d978e2580d706aef82b8e704e44 (patch) | |
| tree | 605eb6bc5db5a9a7c8928b781f3f6d03034ad453 /addons/mail/static/src | |
| parent | 1ce5eaaff078c72dc96bf0376afaf998397c7024 (diff) | |
[ADD] suggested groups
bzr revid: mat@openerp.com-20130328161634-1fcmj0s67bofc6ra
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/css/mail.css | 63 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail_followers.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 4 |
4 files changed, 68 insertions, 4 deletions
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 51306727a09..9604a052c5c 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -664,8 +664,71 @@ .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-left: 20px; + margin-top: 20px; + position: relative; + display: inline-block; + vertical-align: top; + width: 300px; +} + +.openerp .oe_mail_wall_aside > div { + background-color: #EDEDF6; + border-radius: 2px; + padding: 10px; +} +.openerp .oe_mail_wall_aside .oe_user_display { + font-size: 14px; + font-weight: bold; + margin-left: 10px; + color: #7C7BAD; +} +.openerp .oe_mail_wall_aside .oe_suggested_groups { + border-radius: 2px; + width: 100%; + margin-left: 10px; + height: 90px; +} +.openerp .oe_mail_wall_aside .oe_group_images { + width: 20%; + float: left; + padding-right: 20px; +} +.openerp .oe_mail_wall_aside .oe_group_image_content { + border-radius: 2px; + border: solid 1px rgba(0,0,0,0.03); +} +.openerp .oe_mail_wall_aside .oe_join_group { + margin-top: 10px; +} +.openerp .oe_mail_wall_aside .oe_follow_people { + margin-top: 10px; +} +.openerp .oe_mail_wall_aside .oe_remove_suggested_group { + visibility:hidden; + width:3%; + float:right; + margin-right:20px; +} +.openerp .oe_mail_wall_aside .oe_suggested_groups:hover .oe_remove_suggested_group > span { + visibility: visible; +} +.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group { + width: 80%; +} +.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group .oe_group_name { + text-overflow: ellipsis; + overflow: hidden; + width: 90%; +}
\ No newline at end of file diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 98b5c57d652..0290eb1c82b 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -6,6 +6,7 @@ openerp.mail = function (session) { openerp_mail_followers(session, mail); // import mail_followers.js openerp_FieldMany2ManyTagsEmail(session); // import manyy2many_tags_email.js + /** * ------------------------------------------------------------ @@ -1991,4 +1992,6 @@ openerp.mail = function (session) { }); }, }); + + openerp.mail.suggestions(session, mail); }; diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index 6fc2f0fdfcd..79aa3f02dd3 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -3,7 +3,7 @@ openerp_mail_followers = function(session, mail) { _lt = session.web._lt; var mail_followers = session.mail_followers = {}; - + /** * ------------------------------------------------------------ * mail_followers Widget diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index b26ef06f5e4..c7681181c6a 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -195,6 +195,7 @@ </tbody> </table> <div class="oe_mail-placeholder"></div> + <aside class="oe_mail_wall_aside"></aside> </div> <!-- @@ -320,7 +321,4 @@ </a> </span> - <!-- mail.thread.message.star - Template used to display stared/unstared message in a mail.message - --> </template> |
