From 060ef9326849256a50a3ba5594af6b6ad3d0754f Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 11 Dec 2012 12:18:24 +0100 Subject: [IMP] show company logo in chrome bzr revid: chs@openerp.com-20121211111824-dj2ienybj2rxwhjj --- addons/web/static/src/css/base.css | 4 ---- addons/web/static/src/css/base.sass | 4 ---- addons/web/static/src/js/chrome.js | 5 +++++ addons/web/static/src/xml/base.xml | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a4e2ad322f..382a7b3f1ab 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1134,12 +1134,8 @@ width: 220px; display: block; text-align: center; - height: 70px; - line-height: 70px; } .openerp a.oe_logo img { - height: 40px; - width: 157px; margin: 14px 0; border: 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e1789b0524c..b2a8d222e46 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -927,11 +927,7 @@ $sheet-padding: 16px width: 220px display: block text-align: center - height: 70px - line-height: 70px img - height: 40px - width: 157px margin: 14px 0 border: 0 .oe_footer diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index be88f89e711..b76b852a72f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1172,6 +1172,7 @@ instance.web.WebClient = instance.web.Client.extend({ show_application: function() { var self = this; self.toggle_bars(true); + self.update_logo(); self.menu = new instance.web.Menu(self); self.menu.replace(this.$el.find('.oe_menu_placeholder')); self.menu.on('menu_click', this, this.on_menu_action); @@ -1183,6 +1184,10 @@ instance.web.WebClient = instance.web.Client.extend({ self.set_title(); self.check_timezone(); }, + update_logo: function() { + var img = this.session.url('/web/binary/company_logo'); + this.$el.find('.oe_logo img').attr('src', '').attr('src', img); + }, check_timezone: function() { var self = this; return new instance.web.Model('res.users').call('read', [[this.session.uid], ['tz_offset']]).then(function(result) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5ad24a43a6a..a8715515588 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -439,7 +439,7 @@ - +
Powered by OpenERP -- cgit v1.2.3 From 906ceba9488fafa9e7999526c90e7e6c61e69180 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 13 Dec 2012 15:09:14 +0100 Subject: [IMP] lot of small improvements to better detect when a view has finished loading bzr revid: nicolas.vanhoren@openerp.com-20121213140914-8d1u01h17r2x4fpu --- addons/web/static/src/js/chrome.js | 26 +++++++++++++++----------- addons/web/static/src/js/search.js | 2 +- addons/web/static/src/js/view_form.js | 4 +++- addons/web/static/src/js/view_list.js | 4 +++- addons/web/static/src/js/view_tree.js | 5 ++++- addons/web/static/src/js/views.js | 16 ++++++++++------ 6 files changed, 36 insertions(+), 21 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 56af4c9d564..fbe7fbde795 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1122,6 +1122,8 @@ instance.web.WebClient = instance.web.Client.extend({ init: function(parent) { this._super(parent); this._current_state = null; + this.menu_dm = new instance.web.DropMisordered(); + this.action_mutex = new $.Mutex(); }, start: function() { var self = this; @@ -1287,18 +1289,20 @@ instance.web.WebClient = instance.web.Client.extend({ }, on_menu_action: function(options) { var self = this; - return this.rpc("/web/action/load", { action_id: options.action_id }) + return this.menu_dm.add(this.rpc("/web/action/load", { action_id: options.action_id })) .then(function (result) { - if (options.needaction) { - result.context = new instance.web.CompoundContext( - result.context, - {search_default_message_unread: true}); - } - return $.when(self.action_manager.do_action(result, { - clear_breadcrumbs: true, - action_menu_id: self.menu.current_menu, - })).fail(function() { - self.menu.open_menu(options.previous_menu_id); + return self.action_mutex.exec(function() { + if (options.needaction) { + result.context = new instance.web.CompoundContext( + result.context, + {search_default_message_unread: true}); + } + return $.when(self.action_manager.do_action(result, { + clear_breadcrumbs: true, + action_menu_id: self.menu.current_menu, + })).fail(function() { + self.menu.open_menu(options.previous_menu_id); + }); }); }); }, diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index eea8bba726d..34ab101fea7 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -640,7 +640,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea .then(this.proxy('setup_default_query')); return $.when(drawer_started, defaults_fetched) - .done(function () { + .then(function () { self.trigger("search_view_loaded", data); self.ready.resolve(); }); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3f6952e5da4..f422ec01ed3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -128,13 +128,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM self.init_pager(); }); self.on("load_record", self, self.load_record); - this.on('view_loaded', self, self.load_form); instance.web.bus.on('clear_uncommitted_changes', this, function(e) { if (!this.can_be_discarded()) { e.preventDefault(); } }); }, + view_loading: function(r) { + return this.load_form(r); + }, destroy: function() { _.each(this.get_widgets(), function(w) { w.off('focused blurred'); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 04ff8b48923..f6794bd435c 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -90,7 +90,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi this.no_leaf = false; this.grouped = false; - this.on('view_loaded', self, self.load_list); + }, + view_loading: function(r) { + return this.load_list(r); }, set_default_options: function (options) { this._super(options); diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js index acac93f1842..2f9efad9171 100644 --- a/addons/web/static/src/js/view_tree.js +++ b/addons/web/static/src/js/view_tree.js @@ -37,7 +37,10 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie this.options = _.extend({}, this.defaults, options || {}); _.bindAll(this, 'color_for'); - this.on('view_loaded', this, this.load_tree); + }, + + view_loading: function(r) { + return this.load_tree(r); }, /** diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index c949762a5f6..2fe51bcf7e4 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1186,32 +1186,36 @@ instance.web.View = instance.web.Widget.extend({ }, load_view: function(context) { var self = this; - var view_loaded; + var view_loaded_def; if (this.embedded_view) { - view_loaded = $.Deferred(); + view_loaded_def = $.Deferred(); $.async_when().done(function() { - view_loaded.resolve(self.embedded_view); + view_loaded_def.resolve(self.embedded_view); }); } else { if (! this.view_type) console.warn("view_type is not defined", this); - view_loaded = instance.web.fields_view_get({ + view_loaded_def = instance.web.fields_view_get({ "model": this.dataset._model, "view_id": this.view_id, "view_type": this.view_type, "toolbar": !!this.options.$sidebar, }); } - return view_loaded.then(function(r) { + return view_loaded_def.then(function(r) { self.fields_view = r; - self.trigger('view_loaded', r); // add css classes that reflect the (absence of) access rights self.$el.addClass('oe_view') .toggleClass('oe_cannot_create', !self.is_action_enabled('create')) .toggleClass('oe_cannot_edit', !self.is_action_enabled('edit')) .toggleClass('oe_cannot_delete', !self.is_action_enabled('delete')); + return $.when(self.view_loading(r)).then(function() { + self.trigger('view_loaded', r); + }); }); }, + view_loading: function(r) { + }, set_default_options: function(options) { this.options = options || {}; _.defaults(this.options, { -- cgit v1.2.3 From 082ca41f1c3937ab40444675e8952980f11a23f3 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 13 Dec 2012 15:38:49 +0100 Subject: [FIX] when clicking too fast on root menu items, exceptions are thrown randomly lp bug: https://launchpad.net/bugs/1088924 fixed bzr revid: nicolas.vanhoren@openerp.com-20121213143849-4n3qppvu9g9tarae --- addons/web/static/src/js/views.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 2fe51bcf7e4..92f66849fec 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -467,6 +467,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.flags = flags || {}; this.registry = instance.web.views; this.views_history = []; + this.view_completely_inited = $.Deferred(); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -586,6 +587,8 @@ instance.web.ViewManager = instance.web.Widget.extend({ && self.flags.auto_search && view.controller.searchable !== false) { self.searchview.ready.done(self.searchview.do_search); + } else { + self.view_completely_inited.resolve(); } self.trigger("controller_inited",view_type,controller); }); @@ -700,7 +703,9 @@ instance.web.ViewManager = instance.web.Widget.extend({ if (_.isString(groupby)) { groupby = [groupby]; } - controller.do_search(results.domain, results.context, groupby || []); + $.when(controller.do_search(results.domain, results.context, groupby || [])).then(function() { + self.view_completely_inited.resolve(); + }); }); }, /** @@ -782,7 +787,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ var main_view_loaded = this._super(); - var manager_ready = $.when(searchview_loaded, main_view_loaded); + var manager_ready = $.when(searchview_loaded, main_view_loaded, this.view_completely_inited); this.$el.find('.oe_debug_view').change(this.on_debug_changed); this.$el.addClass("oe_view_manager_" + (this.action.target || 'current')); -- cgit v1.2.3 From 80133457d9870abc0f8d201b51d25e1c45882465 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 13 Dec 2012 16:00:33 +0100 Subject: [IMP] useability highlight select when option checked bzr revid: fp@tinyerp.com-20121213150033-89zm08nfop2vf0fe --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 576f179854d..0cd9e48b885 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1368,7 +1368,7 @@ - + or Cancel -- cgit v1.2.3 From 8a3fe9f0c2e244d72796c93ce38093b83cb82af0 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 13 Dec 2012 16:06:53 +0100 Subject: [FIX] make the field text resize correctly lp bug: https://launchpad.net/bugs/1089447 fixed bzr revid: nicolas.vanhoren@openerp.com-20121213150653-slmic4hcc2m95xy0 --- addons/web/static/src/js/view_form.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f422ec01ed3..cfc8be391b4 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2544,6 +2544,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we initialize_content: function() { var self = this; this.$textarea = this.$el.find('textarea'); + this.auto_sized = false; this.default_height = this.$textarea.css('height'); if (this.get("effective_readonly")) { this.$textarea.attr('disabled', 'disabled'); @@ -2563,13 +2564,17 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we } }, render_value: function() { - $(window).resize(); var show_value = instance.web.format_value(this.get('value'), this, ''); if (show_value === '') { this.$textarea.css('height', parseInt(this.default_height)+"px"); } this.$textarea.val(show_value); - this.$textarea.autosize(); + if (! this.auto_sized) { + this.auto_sized = true; + this.$textarea.autosize(); + } else { + this.$textarea.trigger("autosize"); + } }, is_syntax_valid: function() { if (!this.get("effective_readonly") && this.$textarea) { -- cgit v1.2.3 From 52ba63d94afbf762889d178e962b3507f1b9dd15 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 15 Dec 2012 12:08:29 +0100 Subject: [IMP] css modifs bzr revid: fp@tinyerp.com-20121215110829-u3nahqtwckg0qxjx --- addons/web/static/src/css/base.css | 14 ++++++++++---- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c71e26adb48..77ab4239a0d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,7 +30,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp.openerp_webclient_container { height: 100%; @@ -1210,7 +1210,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1235,7 +1235,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2039,6 +2039,12 @@ margin: -16px -16px 0 -16px; padding: 0; } +.openerp .oe_form_nosheet.oe_form_nomargin { + margin: 0; +} +.openerp .oe_form_nosheet.oe_form_nomargin > header { + margin: 0; +} .openerp .oe_form_sheetbg { padding: 16px 0; } @@ -2178,7 +2184,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8efc85c2a04..1e0d45407e7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1624,6 +1624,10 @@ $sheet-padding: 16px > header margin: -16px -16px 0 -16px padding: 0 + .oe_form_nosheet.oe_form_nomargin + margin: 0 + > header + margin: 0 .oe_form_sheetbg padding: 16px 0 .oe_form_sheet_width -- cgit v1.2.3 From af8781cbc1217a2bf199786724c8eb913cb41ad5 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 15 Dec 2012 22:41:13 +0100 Subject: [IMP] CSS of logo bzr revid: fp@tinyerp.com-20121215214113-dmv0ehnh0hezwws1 --- addons/web/static/src/css/base.css | 5 +---- addons/web/static/src/css/base.sass | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9d0221e7082..6e5c73d7bce 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1166,14 +1166,11 @@ text-align: center; } .openerp .oe_footer a { - font-weight: 800; - font-family: serif; - font-size: 16px; + font-weight: bold; color: black; } .openerp .oe_footer a span { color: #c81010; - font-style: italic; } .openerp .oe_secondary_menu_section { font-weight: bold; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5ad6da28bda..c9eb21435cb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -954,13 +954,10 @@ $sheet-padding: 16px width: 220px text-align: center a - font-weight: 800 - font-family: serif - font-size: 16px + font-weight: bold color: black span color: #c81010 - font-style: italic // }}} // Webclient.leftbar items {{{ -- cgit v1.2.3 From 27a1ee52321d0ae33ebb275c99ef599a2bed2772 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 15 Dec 2012 22:55:59 +0100 Subject: [IMP] image if no logo bzr revid: fp@tinyerp.com-20121215215559-kq14di3z8juyv61r --- addons/web/static/src/img/nologo.png | Bin 0 -> 3977 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/web/static/src/img/nologo.png (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/img/nologo.png b/addons/web/static/src/img/nologo.png new file mode 100644 index 00000000000..711269813a1 Binary files /dev/null and b/addons/web/static/src/img/nologo.png differ -- cgit v1.2.3 From d9333329a6baf93672f1466784560fac08dee307 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 17 Dec 2012 09:57:59 +0100 Subject: [FIX] Anonymous login css bzr revid: vta@openerp.com-20121217085759-dpxwrkh4pa81k0pb --- addons/web/static/src/css/base.css | 35 ++++++++++++++++++++++++++++++++++- addons/web/static/src/css/base.sass | 22 ++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6e5c73d7bce..2665ee263a9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,7 +30,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp.openerp_webclient_container { height: 100%; @@ -998,6 +998,39 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar .oe_topbar_anonymous_login { + background-color: #dc5f59; + color: #eeeeee; + background-color: #fc8787; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon)); + background-image: -webkit-linear-gradient(top, #fc8787, maroon); + background-image: -moz-linear-gradient(top, #fc8787, maroon); + background-image: -ms-linear-gradient(top, #fc8787, maroon); + background-image: -o-linear-gradient(top, #fc8787, maroon); + background-image: linear-gradient(to bottom, #fc8787, maroon); +} +.openerp .oe_topbar .oe_topbar_anonymous_login a { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + text-decoration: none; + color: white; + background: transparent; + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -ms-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; +} +.openerp .oe_topbar .oe_topbar_anonymous_login a:hover { + background: rgba(0, 0, 0, 0.1); + color: white; + text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c9eb21435cb..a8445f0ff06 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -827,6 +827,24 @@ $sheet-padding: 16px height: 32px background-color: #414141 @include vertical-gradient(#646060, #262626) + .oe_topbar_anonymous_login + background-color: #dc5f59 + color: #eeeeee + @include vertical-gradient(#FC8787, #800000) + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + text-decoration: none + color: white + background: transparent + @include transition(all 0.2s ease-out) + a:hover + background: rgba(0,0,0,0.1) + color: white + text-shadow: 0px 0px 3px rgba(0,0,0,0.2) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) .oe_topbar_item display: block padding: 5px 10px 7px @@ -1670,7 +1688,7 @@ $sheet-padding: 16px width: 400px padding-bottom: 0 div.oe_chatter - box-sizing: border-box + box-sizing: border-box min-width: $sheet-min-width + 2* $sheet-padding max-width: $sheet-max-width + 2* $sheet-padding margin: 0 auto @@ -1942,7 +1960,7 @@ $sheet-padding: 16px overflow: hidden width: 24px overflow: hidden - background: transparent + background: transparent color: #7C7BAD box-shadow: none border: none -- cgit v1.2.3 From b897974d61a496f25a90923401d69da2a90a2c53 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 17 Dec 2012 10:08:57 +0100 Subject: [FIX] do not show timezone if anonymous bzr revid: vta@openerp.com-20121217090857-m2ye3pm0bjdm341d --- addons/web/static/src/js/chrome.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 17116f18d3f..d6c0bbf08f9 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -811,7 +811,7 @@ instance.web.Menu = instance.web.Widget.extend({ }); } }); - + }, start: function() { this._super.apply(this, arguments); @@ -1200,7 +1200,7 @@ instance.web.WebClient = instance.web.Client.extend({ var browser_offset = (offset < 0) ? "-" : "+"; browser_offset += _.str.sprintf("%02d", Math.abs(offset / 60)); browser_offset += _.str.sprintf("%02d", Math.abs(offset % 60)); - if (browser_offset !== user_offset) { + if (browser_offset !== user_offset && self.session.username !== 'anonymous') { var $icon = $(QWeb.render('WebClient.timezone_systray')); $icon.on('click', function() { var notification = self.do_warn(_t("Timezone mismatch"), QWeb.render('WebClient.timezone_notification', { -- cgit v1.2.3 From 5e2a77f589480c8d263980cf600cc89353978802 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 17 Dec 2012 10:32:49 +0100 Subject: [FIX] remove previous change bzr revid: vta@openerp.com-20121217093249-vilaitfirtnc7mvw --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d6c0bbf08f9..ea605e562d9 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1200,7 +1200,7 @@ instance.web.WebClient = instance.web.Client.extend({ var browser_offset = (offset < 0) ? "-" : "+"; browser_offset += _.str.sprintf("%02d", Math.abs(offset / 60)); browser_offset += _.str.sprintf("%02d", Math.abs(offset % 60)); - if (browser_offset !== user_offset && self.session.username !== 'anonymous') { + if (browser_offset !== user_offset) { var $icon = $(QWeb.render('WebClient.timezone_systray')); $icon.on('click', function() { var notification = self.do_warn(_t("Timezone mismatch"), QWeb.render('WebClient.timezone_notification', { -- cgit v1.2.3 From 1260f7059f4fb63b4d9cbfb8325e65b4dcdcf854 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 17 Dec 2012 10:53:23 +0100 Subject: [FIX] argh bzr revid: vta@openerp.com-20121217095323-p9r0p2jps01i8orl --- addons/web/static/src/js/chrome.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ea605e562d9..6101a712458 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -811,7 +811,6 @@ instance.web.Menu = instance.web.Widget.extend({ }); } }); - }, start: function() { this._super.apply(this, arguments); -- cgit v1.2.3