From 7cdf99ade180b00af9caa6094d624007d47a3dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 26 Oct 2012 11:58:21 +0200 Subject: [PATCH 1/2] [IMP] mail: improved display of openchatter in form views bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso --- addons/account/account_invoice_view.xml | 4 +-- .../account_voucher/account_voucher_view.xml | 2 +- .../voucher_payment_receipt_view.xml | 4 +-- .../voucher_sales_purchase_view.xml | 4 +-- addons/analytic/analytic_view.xml | 2 +- addons/base_calendar/crm_meeting_view.xml | 2 +- addons/crm/crm_lead_view.xml | 4 +-- addons/crm/crm_phonecall_view.xml | 2 +- addons/crm/crm_view.xml | 2 +- addons/crm_claim/crm_claim_view.xml | 2 +- addons/event/event_view.xml | 4 +-- addons/hr/hr_view.xml | 2 +- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- addons/hr_expense/hr_expense_view.xml | 2 +- addons/hr_holidays/hr_holidays_view.xml | 4 +-- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- addons/idea/idea_view.xml | 2 +- addons/mail/mail_group_view.xml | 3 +- addons/mail/res_partner_view.xml | 3 +- addons/mail/static/src/css/mail.css | 16 ++++++++--- addons/mail/static/src/js/mail_followers.js | 28 +++++++++++-------- addons/mail/static/src/xml/mail.xml | 4 +-- addons/mail/static/src/xml/mail_followers.xml | 6 ++-- addons/mrp/mrp_view.xml | 4 +-- addons/mrp_operations/mrp_operations_view.xml | 2 +- addons/mrp_repair/mrp_repair_view.xml | 2 +- addons/procurement/procurement_view.xml | 2 +- addons/product/product_view.xml | 2 +- addons/project/project_view.xml | 4 +-- addons/project_issue/project_issue_view.xml | 2 +- addons/purchase/purchase_view.xml | 2 +- .../purchase_requisition_view.xml | 2 +- addons/sale/sale_view.xml | 2 +- addons/stock/stock_view.xml | 4 +-- 34 files changed, 71 insertions(+), 63 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 5ed373456f3..b08a5f1a410 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -279,8 +279,8 @@
- +
@@ -436,8 +436,8 @@
- +
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 4b02d697982..babe60b640e 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -109,8 +109,8 @@
- +
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index e1a48c6c535..6666ac77d2f 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -240,8 +240,8 @@
- +
@@ -512,8 +512,8 @@
- +
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index a362c553ccd..665ad4fb17f 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -147,8 +147,8 @@
- +
@@ -303,8 +303,8 @@
- +
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 0bb009e72b0..e769ea86f55 100644 --- a/addons/analytic/analytic_view.xml +++ b/addons/analytic/analytic_view.xml @@ -54,8 +54,8 @@
- +
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 9dd37afa3d6..26d1d409047 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -224,8 +224,8 @@
- +
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index a0dce6a7ea9..b6890a7de07 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -223,8 +223,8 @@
- +
@@ -525,8 +525,8 @@
- +
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index b6e2f09de68..e721cf9f57f 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -150,8 +150,8 @@
- +
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index ba46cc023ab..5e2034d6373 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -132,8 +132,8 @@
- +
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 0d9b5adef43..7d7d6459cba 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -179,8 +179,8 @@
- +
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 2b275898383..2227188ec1c 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -204,8 +204,8 @@
- +
@@ -486,8 +486,8 @@
- +
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index cab93c6c14a..4bf071337aa 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -359,8 +359,8 @@
- +
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 7164e7d9415..697ed6bacea 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -210,8 +210,8 @@
- +
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 76393d9e030..e9f69a22184 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -139,8 +139,8 @@
- +
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 1808e216906..7ccace1c536 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -121,8 +121,8 @@
- +
@@ -158,8 +158,8 @@
- +
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 12c552e7a6d..d67a543d683 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -183,8 +183,8 @@
- +
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 5a1482830e1..5d9054bf4b7 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -79,8 +79,8 @@
- +
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index 6268cd425b1..2028e8d1b18 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -82,9 +82,8 @@
- +
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml index 2a8430926d5..a4aa56ae971 100644 --- a/addons/mail/res_partner_view.xml +++ b/addons/mail/res_partner_view.xml @@ -9,9 +9,8 @@
- +
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index daa8594cba4..16d8a5ba24b 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -4,9 +4,8 @@ box-sizing: border-box; } .openerp .oe_mail { - display: inline-block; + display: block; position: relative; - width: 720px; margin: 0px; } .openerp .oe_mail .oe_thread{ @@ -257,7 +256,7 @@ position: relative; display: inline-block; padding-top: 4px; - width: 120px; + width: 160px; float: right; } @@ -302,6 +301,11 @@ /* b) THE FOLLOWERS */ .openerp .oe_followers .oe_follower_title{ margin-top: 4px; + margin-bottom: 4px; + display: inline; +} +.openerp .oe_followers .oe_invite{ + float: right; } .openerp .oe_followers .oe_partner { height: 32px; @@ -323,10 +327,14 @@ /* ----------- FORM INTEGRATION ------------ */ - /* Nothing to do yay! */ +.openerp .oe_record_thread{ + display: block; + margin-right: 180px; +} /* ----------- INBOX INTEGRATION ----------- */ .openerp .oe_mail_wall .oe_mail{ margin: 16px; + width: 720px; } diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index bf913df0b04..7fed5371600 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -25,7 +25,6 @@ openerp_mail_followers = function(session, mail) { init: function() { this._super.apply(this, arguments); this.image = this.node.attrs.image || 'image_small'; - this.title = this.node.attrs.title || 'Followers'; this.comment = this.node.attrs.help || false; this.displayed_nb = this.node.attrs.displayed_nb || 10; this.ds_model = new session.web.DataSetSearch(this, this.view.model); @@ -115,20 +114,25 @@ openerp_mail_followers = function(session, mail) { self.message_is_follower = (_.indexOf(self.get('value'), pid) != -1); }).pipe(self.proxy('display_generic')); }, - + _format_followers: function(count){ + console.log('FORMAT FOLLWERS :',count); + function _t(str){return str;} + var str = ''; + if(count <= 0){ + str = _t('No followers'); + }else if(count === 1){ + str = _t('One follower'); + }else{ + str = ''+count+' '+_t('followers'); + } + console.log('URGH:',str); + return str; + }, /* Display generic info about follower, for people not having access to res_partner */ display_generic: function () { var self = this; var node_user_list = this.$('.oe_follower_list').empty(); - // format content: Followers (You and 0 other) // Followers (3) - var content = this.title; - if (this.message_is_follower) { - content += ' (You and ' + (this.get('value').length-1) + ' other)'; - } - else { - content += ' (' + this.get('value').length + ')' - } - this.$('.oe_follower_title').html(content); + this.$('.oe_follower_title').html(this._format_followers(this.get('value').length)); }, /** Display the followers */ @@ -138,7 +142,7 @@ openerp_mail_followers = function(session, mail) { this.message_is_follower = this.set_is_follower(records); // clean and display title var node_user_list = this.$('.oe_follower_list').empty(); - this.$('.oe_follower_title').html(this.title + ' (' + records.length + ')'); + this.$('.oe_follower_title').html(this._format_followers(records.length)); // truncate number of displayed followers truncated = records.splice(0, this.displayed_nb); _(truncated).each(function (record) { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index ae8b622c978..ce3b0bed3b6 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -179,10 +179,10 @@ Template used to display the communication history in documents form view. --> - +
- +
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 02796c5d80a..df4fd0c7fd9 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -17,10 +17,8 @@
- - -

- +

Followers

+ Invite others
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9d1ae9eae8a..57531c8b4bb 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -409,8 +409,8 @@
- +
@@ -797,8 +797,8 @@
- +
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 834f3000472..13d02c8151c 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -107,8 +107,8 @@
- +
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index 55cbe49c75b..2e8a1ae6ba9 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -189,8 +189,8 @@
- +
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 973a09477fc..42179b17f92 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -103,8 +103,8 @@
- +
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 74b2b868f7a..028e416984b 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -166,8 +166,8 @@
- +
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 0de5e1773b1..cc22a90e324 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -151,8 +151,8 @@
- +
@@ -466,8 +466,8 @@
- +
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6ff5388ce4a..f03c48ed6df 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -159,8 +159,8 @@
- +
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 1ec1cd452c9..a8d57799858 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -287,8 +287,8 @@
- +
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index c4c2702d99c..5ee0a007cc9 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -102,8 +102,8 @@
- +
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 4d57dfcf9e0..df12d3671af 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -309,8 +309,8 @@
- +
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 806c723dc73..2883e765235 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -912,8 +912,8 @@
- +
@@ -1038,8 +1038,8 @@
- +
From 38f4a6137afe056ec7873570cc232a9450120a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 26 Oct 2012 16:57:58 +0200 Subject: [PATCH 2/2] [IMP] mail: improved followers widget layout bzr revid: fva@openerp.com-20121026145758-sfwxii65fizb3nqa --- addons/mail/static/src/css/mail.css | 13 +++++++++---- addons/mail/static/src/js/mail.js | 8 ++++---- addons/mail/static/src/xml/mail_followers.xml | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 16d8a5ba24b..ef363661d8c 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -31,6 +31,9 @@ margin-bottom:0px; min-height:34px; } +.openerp .oe_msg .oe_msg_intented:last-child(){ + margin-bottom: 4px; +} .openerp .oe_mail .oe_msg_indented .oe_msg_icon{ width:32px; margin:1px; @@ -255,7 +258,7 @@ .openerp .oe_followers{ position: relative; display: inline-block; - padding-top: 4px; + padding-top: 5px; width: 160px; float: right; } @@ -295,15 +298,17 @@ } .openerp .oe_followers .oe_subtype_list{ - margin-bottom: 4px; + margin-top: 4px; } /* b) THE FOLLOWERS */ .openerp .oe_followers .oe_follower_title{ - margin-top: 4px; - margin-bottom: 4px; display: inline; } +.openerp .oe_followers .oe_follower_title_box{ + margin-top: 12px; + margin-bottom: 4px; +} .openerp .oe_followers .oe_invite{ float: right; } diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 78aa3e8513d..67e66a6a11a 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -542,7 +542,7 @@ openerp.mail = function (session) { } this.flag_used = true; - this.animated_destroy({'fadeTime':300}); + this.animated_destroy({'fadeTime':200}); this.parent_thread.message_fetch(this.domain, this.context); return false; }, @@ -791,7 +791,7 @@ openerp.mail = function (session) { event.stopPropagation(); if (! confirm(_t("Do you really want to delete this message?"))) { return false; } - this.animated_destroy({fadeTime:250}); + this.animated_destroy({fadeTime:150}); // delete this message and his childs var ids = [this.id].concat( this.get_child_ids() ); this.ds_message.unlink(ids); @@ -807,7 +807,7 @@ openerp.mail = function (session) { if ( (this.to_read && this.options.typeof_thread == 'inbox') || (!this.to_read && this.options.typeof_thread == 'archives')) { - this.animated_destroy({fadeTime:250}); + this.animated_destroy({fadeTime:150}); } // if this message is read, all childs message display is read @@ -900,7 +900,7 @@ openerp.mail = function (session) { } else { button.removeClass('oe_starred'); if ( self.options.typeof_thread == 'stared' ) { - self.animated_destroy({fadeTime:250}); + self.animated_destroy({fadeTime:150}); } } }); diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index df4fd0c7fd9..3ba38f067d0 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -17,8 +17,10 @@
-

Followers

- Invite others +
+

Followers

+ Invite others +