From f07e01f491c38a278c844b25775bd477fd704d32 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 25 Oct 2013 17:38:29 +0200 Subject: [ADD]mail: The announcement bar (blue bar) to inform customers bzr revid: dle@openerp.com-20131025153829-xu6mee27a4hajnk3 --- addons/mail/static/src/js/announcement.js | 21 +++++++++++++++++++++ addons/mail/static/src/js/mail.js | 1 + 2 files changed, 22 insertions(+) create mode 100644 addons/mail/static/src/js/announcement.js (limited to 'addons/mail/static/src/js') diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js new file mode 100644 index 00000000000..7d16a4a1621 --- /dev/null +++ b/addons/mail/static/src/js/announcement.js @@ -0,0 +1,21 @@ +openerp_announcement = function(instance) { + var _t = instance.web._t; + instance.web.WebClient.include({ + show_application: function() { + var self = this; + this._super(); + var config_parameter = new instance.web.Model('ir.config_parameter'); + return config_parameter.call('get_param', ['database.uuid', false]).then(function(result) { + var head = $('head'); + head.append($('') + .attr({ + rel : 'stylesheet', + type: 'text/css', + href: 'http://127.0.0.1.xip.io:8369/openerp_enterprise/'+result+'.css', + media: 'all', + }) + ); + }); + }, + }); +}; \ 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 63581560810..96b2184ece9 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 + openerp_announcement(session); /** * ------------------------------------------------------------ -- cgit v1.2.3 From eba79e46a53f0977b08af108c1fb2f0ad5421ee9 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 2 Dec 2013 12:45:16 +0100 Subject: [FIX] mail: correct announcement bar bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx --- addons/mail/static/src/js/announcement.js | 61 +++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 16 deletions(-) (limited to 'addons/mail/static/src/js') diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index 7d16a4a1621..e05d959dede 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -1,21 +1,50 @@ openerp_announcement = function(instance) { - var _t = instance.web._t; - instance.web.WebClient.include({ - show_application: function() { + instance.web.WebClient.include({ + show_application: function() { + return $.when(this._super.apply(this, arguments)).then(this.proxy('show_annoucement_bar')); + }, + _ab_location: function(dbuuid) { + return _.str.sprintf('https://services.openerp.com/openerp-enterprise/ab/css/%s.css', dbuuid); + }, + show_annoucement_bar: function() { + if (this.session.get_cookie('ab') === 'c') { + return; + } var self = this; - this._super(); var config_parameter = new instance.web.Model('ir.config_parameter'); - return config_parameter.call('get_param', ['database.uuid', false]).then(function(result) { - var head = $('head'); - head.append($('') - .attr({ - rel : 'stylesheet', - type: 'text/css', - href: 'http://127.0.0.1.xip.io:8369/openerp_enterprise/'+result+'.css', - media: 'all', - }) - ); + var $bar = this.$el.find('.announcement_bar'); + return config_parameter.call('get_param', ['database.uuid', false]).then(function(dbuuid) { + if (!dbuuid) { + return; + } + var $css = $('').attr({ + rel : 'stylesheet', + type: 'text/css', + media: 'all', + href: self._ab_location(dbuuid) + }); + $css.on('load', function() { + var close = function() { + var data = window.getComputedStyle($bar.find('.data')[0], ':before').content || "'{}'"; + var delim = data[0]; + data = data.slice(1, data.length - 1).replace(new RegExp('\\\\'+delim, 'g'), delim); + try { + data = JSON.parse(data); + } catch(_e) { + data = {}; + } + var ttl = data.close_ttl || 24*60*60; + self.session.set_cookie('ab', 'c', ttl); + + $bar.slideUp('slow'); + }; + $bar.on('dblclick', close); + $bar.find('.close').on('click', close); + self.trigger('ab_loaded', $bar); + }); + + $('head').append($css); }); - }, + } }); -}; \ No newline at end of file +}; -- cgit v1.2.3 From f8b889e1db02e7b807812b276825a964520eced9 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 9 Dec 2013 20:24:00 +0100 Subject: [IMP] mail: announcement bar only for screen bzr revid: chs@openerp.com-20131209192400-01jpkaofq1arqekz --- addons/mail/static/src/js/announcement.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/static/src/js') diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index e05d959dede..b7a2839ac43 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -20,7 +20,7 @@ openerp_announcement = function(instance) { var $css = $('').attr({ rel : 'stylesheet', type: 'text/css', - media: 'all', + media: 'screen', href: self._ab_location(dbuuid) }); $css.on('load', function() { -- cgit v1.2.3 From 5520d73d5fc062bdef2e32dba02a79aa831d1f04 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 9 Dec 2013 20:24:50 +0100 Subject: [IMP] mail: announcement bar: no dblclick bzr revid: chs@openerp.com-20131209192450-zacfq6i0xli7vjju --- addons/mail/static/src/js/announcement.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/mail/static/src/js') diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index b7a2839ac43..f61cf534010 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -38,7 +38,6 @@ openerp_announcement = function(instance) { $bar.slideUp('slow'); }; - $bar.on('dblclick', close); $bar.find('.close').on('click', close); self.trigger('ab_loaded', $bar); }); -- cgit v1.2.3 From 0d02d066756b98ec4bb08178746ba00a4bbcba1b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 10 Dec 2013 18:47:28 +0100 Subject: [IMP] mail: announcement bar: hardcode close ttl + update link with dbuuid bzr revid: chs@openerp.com-20131210174728-hgkbv609mwq8iuu5 --- addons/mail/static/src/js/announcement.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'addons/mail/static/src/js') diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index f61cf534010..0dd438d13af 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -17,7 +17,9 @@ openerp_announcement = function(instance) { if (!dbuuid) { return; } - var $css = $('').attr({ + var $link = $bar.find('.url a'); + $link.attr('href', _.str.sprintf('%s/%s', $link.attr('href'), dbuuid)); + var $css = $('').attr({ rel : 'stylesheet', type: 'text/css', media: 'screen', @@ -25,17 +27,8 @@ openerp_announcement = function(instance) { }); $css.on('load', function() { var close = function() { - var data = window.getComputedStyle($bar.find('.data')[0], ':before').content || "'{}'"; - var delim = data[0]; - data = data.slice(1, data.length - 1).replace(new RegExp('\\\\'+delim, 'g'), delim); - try { - data = JSON.parse(data); - } catch(_e) { - data = {}; - } - var ttl = data.close_ttl || 24*60*60; + var ttl = 7*24*60*60; self.session.set_cookie('ab', 'c', ttl); - $bar.slideUp('slow'); }; $bar.find('.close').on('click', close); -- cgit v1.2.3