From 8f8e6967d1780736f9bc6b5c3d58c02c72f18cdd Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 8 Oct 2012 18:27:09 +0530 Subject: [PATCH 001/264] [IMP]pos product can not consider pricelist price it only consider list price of product. make it work on price of product of given pricelist bzr revid: sgo@tinyerp.com-20121008125709-rxfptf69lyaj0p3a --- addons/point_of_sale/static/src/js/models.js | 2 +- addons/point_of_sale/static/src/js/screens.js | 2 +- addons/point_of_sale/static/src/xml/pos.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 2c6f4e8b6e0..a2131f06960 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -333,7 +333,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal this.pos = options.pos; this.order = options.order; this.product = options.product; - this.price = options.product.get('list_price'); + this.price = options.product.get('price'); this.quantity = 1; this.discount = 0; this.type = 'unit'; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 1ad03c5ead1..1b8a224c7c8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -530,7 +530,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, get_product_price: function(){ var product = this.get_product(); - return (product ? product.get('list_price') : 0) || 0; + return (product ? product.get('price') : 0) || 0; }, get_product_weight: function(){ return this.weight || 0; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 854dd61cc1b..a34e405b101 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -368,12 +368,12 @@ - + - + From f78b41c2ba4d26a89082e82e5585de548dcca4b5 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 17 Oct 2012 18:30:47 +0530 Subject: [PATCH 002/264] [IMP] Right click on header logo open dialog box to resize logo. bzr revid: bth@tinyerp.com-20121017130047-xw1j2jw9eje8wn8p --- addons/web/static/src/js/chrome.js | 10 +++++++++- addons/web/static/src/xml/base.xml | 19 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 67e36678040..bfcb7639a26 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -983,7 +983,15 @@ instance.web.WebClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).pipe(function() { - self.$el.on('click', '.oe_logo', function() { + self.$el.on('contextmenu','.oe_logo',function(e) { + instance.web.dialog($(QWeb.render('Resolution')),{ + title: "OpenERP Resolution" }); + $('.resolution a').click(function() { + self.$el.find('.oe_logo').css('width', $(this).text()+"px"); + self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); + }) + }) + self.$el.on('click', '.oe_logo', function(e) { self.action_manager.do_action('home'); }); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a09897862f6..956d5164729 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -10,6 +10,21 @@ Loading... + +
+ + + + + + + + + + +
100px200px
250px300px
+
+
@@ -404,7 +419,7 @@ - +
Powered by OpenERP @@ -1090,7 +1105,7 @@
- Edit + Edit -
- - - - - - - - - - -
100px200px
250px300px
-
+
+ + + + + + + + + + + + + + + + +
100px200px
250px300px
Original
+
From decc05e68eb1b57c2f02b5a005a3d28fd367c5fa Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 18 Oct 2012 12:48:40 +0530 Subject: [PATCH 004/264] [IMP] Set height & width for logo and improve code. bzr revid: bth@tinyerp.com-20121018071840-mzl3286v0twl088n --- addons/web/static/src/js/chrome.js | 10 ++++------ addons/web/static/src/xml/base.xml | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ce871af68c3..a039433f09b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -987,12 +987,10 @@ instance.web.WebClient = instance.web.Client.extend({ instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); $('.resolution a').click(function() { - if ($(this).text() == "Original") { - self.$el.find('.oe_logo').css('width', "220px"); - self.$el.find('.oe_logo img').css('width', "157px"); - } - self.$el.find('.oe_logo').css('width', $(this).text()+"px"); - self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); + self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px"); + self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px"); + self.$el.find('.oe_logo img').css('width', $(this).attr('imgw')+"px"); + self.$el.find('.oe_logo img').css('height', $(this).attr('imgh')+"px"); }) }) self.$el.on('click', '.oe_logo', function(e) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 90dc55cb29a..99437d8d66f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -17,16 +17,16 @@ - 100px - 200px + 150 x 60 + 250 x 90 - 250px - 300px + 290 x 90 + 320 x 100 - Original + Original
From 419f31928cdd562fec4c45e5e65bf4c9dd1cfb75 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 18 Oct 2012 17:56:20 +0530 Subject: [PATCH 005/264] [Fix]display in a form what are the keyboard shortcuts defined in screen when hold ALT key bzr revid: vja@tinyerp.com-20121018122620-7angnmxvaig2l8ac --- addons/web/static/src/css/base.css | 34 +++---- addons/web/static/src/js/view_form.js | 136 ++++++++------------------ addons/web/static/src/xml/base.xml | 15 ++- 3 files changed, 61 insertions(+), 124 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e4b8885b1a1..5dc5f7d8cbf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -473,6 +474,11 @@ max-width: 180px; max-height: 180px; } +.openerp .oe_view_manager_current .accessactive{ + text-decoration:underline; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + font-weight:bold; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -2561,12 +2567,6 @@ .openerp .oe_list.oe_list_editable td.oe_list_record_delete { position: absolute; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) { - color: transparent; -} -.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) * { - visibility: hidden; -} .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button { top: 5px; } @@ -2585,10 +2585,10 @@ } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; - width: 100% !important; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { - width: 100% !important; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { width: 100% !important; @@ -2597,9 +2597,6 @@ min-width: 0 !important; max-width: none !important; } -.openerp .oe_list_group_name { - white-space: nowrap; -} .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } @@ -2659,17 +2656,14 @@ background: #eeeeee; vertical-align: top; } +.openerp .oe_list_content > thead th { + position: relative; +} .openerp .oe_list_content td, .openerp .oe_list_content th { padding: 3px 6px; line-height: 18px; } -.openerp .oe_list_content th.oe_sortable, .openerp .oe_list_content th.oe_sortable div { - cursor: pointer; -} -.openerp .oe_list_content th.oe_sortable div { - position: relative; -} -.openerp .oe_list_content th.oe_sortable div:after { +.openerp .oe_list_content th:after { position: absolute; right: 6px; content: ""; @@ -2679,12 +2673,12 @@ border-color: black transparent; visibility: hidden; } -.openerp .oe_list_content th.sortup div:after { +.openerp .oe_list_content th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe_list_content th.sortdown div:after { +.openerp .oe_list_content th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index bc171ef1d6e..f43a4f10da2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -125,9 +125,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM self.check_actual_mode(); self.on("change:actual_mode", self, self.init_pager); self.init_pager(); + self.widgetAccesskey(); }); 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(); @@ -144,13 +144,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this._super(); }, - load_form: function(data) { + on_loaded: function(data) { var self = this; if (!data) { throw new Error("No data provided."); } if (this.arch) { - throw "Form view does not support multiple calls to load_form"; + throw "Form view does not support multiple calls to on_loaded"; } this.fields_order = []; this.fields_view = data; @@ -214,9 +214,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM e.stopPropagation(); } }); - this.trigger('form_view_loaded', data); + return $.when(); }, + widgetAccesskey:function(){ + $(document).keydown(function(e){ + if(e.keyCode === $.ui.keyCode.ALT) { + $("[accesskey] span").addClass('accessactive'); + } + e.stopPropagation(); + }).keyup(function(e){ + $("[accesskey] span").removeClass('accessactive'); + }); + }, widgetFocused: function() { // Clear click flag if used to focus a widget this.__clicked_inside = false; @@ -2153,20 +2163,6 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w self.do_action(r); }); }, - - set_dimensions: function (height, width) { - // remove width css property - this.$el.css('width', ''); - // extract style (without width) - var old_style = this.$el.attr('style'); - // jQuery doesn't understand/use !important - var style = 'width:' + width + 'px !important;'; - if (old_style) { - style += old_style - } - this.$el.attr('style', style); - this.$el.css('minHeight', height); - } }); /** @@ -2545,13 +2541,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we focus: function($el) { this.$textarea.focus(); }, - set_dimensions: function (height, width) { - this._super(); - this.$textarea.css({ - width: width, - minHeight: height - }); - }, }); /** @@ -3172,9 +3161,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc return ! this.get("value"); }, focus: function () { - if (!this.get('effective_readonly')) { - this.$input.focus(); - } + this.$input.focus(); }, _quick_create: function() { this.no_ed = true; @@ -3351,23 +3338,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on('edit:before', self, function (e) { e.cancel = true; }); - var has_handle = _(controller.columns).find(function (column) { - if (!column instanceof instance.web.list.Handle) { - return false; - } - column.modifiers.tree_invisible = true; - column.invisible = '1'; - // remove from visibles - controller.visible_columns.splice( - controller.visible_columns.indexOf(column), - 1); - return true; - }); - if (has_handle) { - // recompute aggregates - controller.aggregate_columns = - _(controller.visible_columns).invoke('to_aggregate'); - } } } else if (view_type === "form") { if (self.get("effective_readonly")) { @@ -3603,7 +3573,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ _template: 'One2Many.listview', init: function (parent, dataset, view_id, options) { this._super(parent, dataset, view_id, _.extend(options || {}, { - GroupsType: instance.web.form.One2ManyGroups, ListType: instance.web.form.One2ManyList })); this.on('edit:before', this, this.proxy('_before_edit')); @@ -3784,13 +3753,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ }); } }); -instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({ - setup_resequence_rows: function () { - if (!this.view.o2m.get('effective_readonly')) { - this._super.apply(this, arguments); - } - } -}); instance.web.form.One2ManyList = instance.web.ListView.List.extend({ pad_table_to: function (count) { if (!this.view.is_action_enabled('create')) { @@ -3851,7 +3813,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({ instance.web.form.One2ManyFormView = instance.web.FormView.extend({ form_template: 'One2Many.formview', - load_form: function(data) { + on_loaded: function(data) { this._super(data); var self = this; this.$buttons.find('button.oe_form_button_create').click(function() { @@ -4061,7 +4023,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ } this.list_view.m2m_field = this; var loaded = $.Deferred(); - this.list_view.on("list_view_loaded", self, function() { + this.list_view.on_loaded.add_last(function() { self.initial_is_loaded.resolve(); loaded.resolve(); }); @@ -4106,17 +4068,13 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in ); var self = this; pop.on("elements_selected", self, function(element_ids) { - var reload = false; - _(element_ids).each(function (id) { - if(! _.detect(self.dataset.ids, function(x) {return x == id;})) { - self.dataset.set_ids(self.dataset.ids.concat([id])); + _.each(element_ids, function(one_id) { + if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { + self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); self.m2m_field.dataset_changed(); - reload = true; + self.reload_content(); } }); - if (reload) { - self.reload_content(); - } }); }, do_activate_record: function(index, id) { @@ -4185,7 +4143,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( } this.kanban_view.m2m = this; var loaded = $.Deferred(); - this.kanban_view.on("kanban_view_loaded",self,function() { + this.kanban_view.on_loaded.add_last(function() { self.initial_is_loaded.resolve(); loaded.resolve(); }); @@ -4409,7 +4367,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.view_form.set_embedded_view(this.options.alternative_form_view); } this.view_form.appendTo(this.$el.find(".oe_popup_form")); - this.view_form.on("form_view_loaded", self, function() { + this.view_form.on_loaded.add_last(function() { var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", { multi_select: multi_select, @@ -4520,7 +4478,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend } this.searchview = new instance.web.SearchView(this, this.dataset, false, search_defaults); - this.searchview.on('search_data', self, function(domains, contexts, groupbys) { + this.searchview.on_search.add(function(domains, contexts, groupbys) { if (self.initial_ids) { self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]), contexts, groupbys); @@ -4529,7 +4487,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.do_search(domains.concat([self.domain]), contexts.concat(self.context), groupbys); } }); - this.searchview.on("search_view_loaded", self, function() { + this.searchview.on_loaded.add_last(function () { self.view_list = new instance.web.form.SelectCreateListView(self, self.dataset, false, _.extend({'deletable': false, @@ -4546,7 +4504,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }).pipe(function() { self.searchview.do_search(); }); - self.view_list.on("list_view_loaded", self, function() { + self.view_list.on_loaded.add_last(function() { self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self})); var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { @@ -4559,7 +4517,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }); }); }); - this.searchview.appendTo($(".oe_popup_search", self.$el)); + this.searchview.appendTo($(".oe_popup_list", self.$el)); }, do_search: function(domains, contexts, groupbys) { var self = this; @@ -4695,19 +4653,14 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. var self = this; this._super(field_manager, node); this.binary_value = false; - this.useFileAPI = !!window.FileReader; - if (!this.useFileAPI) { - this.fileupload_id = _.uniqueId('oe_fileupload'); - $(window).on(this.fileupload_id, function() { - var args = [].slice.call(arguments).slice(1); - self.on_file_uploaded.apply(self, args); - }); - } + this.fileupload_id = _.uniqueId('oe_fileupload'); + $(window).on(this.fileupload_id, function() { + var args = [].slice.call(arguments).slice(1); + self.on_file_uploaded.apply(self, args); + }); }, stop: function() { - if (!this.useFileAPI) { - $(window).off(this.fileupload_id); - } + $(window).off(this.fileupload_id); this._super.apply(this, arguments); }, initialize_content: function() { @@ -4725,22 +4678,13 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. return size.toFixed(2) + ' ' + units[i]; }, on_file_change: function(e) { - var self = this; - var file_node = e.target; - if ((this.useFileAPI && file_node.files.length) || (!this.useFileAPI && $(file_node).val() !== '')) { - if (this.useFileAPI) { - var file = file_node.files[0]; - var filereader = new FileReader(); - filereader.readAsDataURL(file); - filereader.onloadend = function(upload) { - var data = upload.target.result; - data = data.split(',')[1]; - self.on_file_uploaded(file.size, file.name, file.type, data); - }; - } else { - this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); - this.$el.find('form.oe_form_binary_form').submit(); - } + // TODO: on modern browsers, we could directly read the file locally on client ready to be used on image cropper + // http://www.html5rocks.com/tutorials/file/dndfiles/ + // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler + + if ($(e.target).val() !== '') { + this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); + this.$el.find('form.oe_form_binary_form').submit(); this.$el.find('.oe_form_binary_progress').show(); this.$el.find('.oe_form_binary').hide(); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 899bd614f76..b543b31e75e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -631,9 +631,9 @@
+ t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"> -
+ @@ -730,15 +730,15 @@
- +
+ type="button" class="oe_button oe_form_button_create" accesskey="C">Create - + or - Discard + Discard
@@ -1297,8 +1297,7 @@
+ contenteditable="true"/>
Date: Thu, 18 Oct 2012 18:13:53 +0530 Subject: [PATCH 006/264] [IMP] Added code for the notification numbers when number > 99 than infinity image will be display. bzr revid: psa@tinyerp.com-20121018124353-gf7h6t44lirh8rg3 --- addons/web/static/src/img/infinity.gif | Bin 0 -> 1049 bytes addons/web_kanban/static/src/xml/web_kanban.xml | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 addons/web/static/src/img/infinity.gif diff --git a/addons/web/static/src/img/infinity.gif b/addons/web/static/src/img/infinity.gif new file mode 100644 index 0000000000000000000000000000000000000000..509f6846a49113f176fc439f78eedec21ca5fbf6 GIT binary patch literal 1049 zcmbu8(Myz35XH}ChO#ERNfD9oxxQqSq(fw6AhOsN1R`vd^-vp*NC|?a6oiWzZWIyp z;)Mv6=wTsHf{<2%h#=w?5eY>ILeNVny+tqG&V2tu_hDg}nKQpR^X;+YJspQH?7=Sl z27)~wf(t=IkPu*z_rbg1HFyagmUKQi7n}ws!NF?P2X#R;s04+ziVxy~Xb=ekDh2oe z7oY(Wz<}D6rWTu74Vz=nd9U7!_pq^yobyh-6YpRYOsey$Ud1a6inZdrs2A}9GP2df zd8mhYa4M-OMrcwJi#ZOaHl?Y>X4pa&^Qm*<9Be<1Wu)pE9nO@*-bmh#D%#bsVPQib`pym987IW!%k$?Of%*KFGeG|AICBh z*vDbM#`m^ld_uE1zKYexMw{!gch(x)VMmBJG^H5YZW42ta4gNwfmfn=+-U@Y2AWe+_NN;RxtgfzBDwT4%Tq>2u$H(*ed^VfSWHRZrX*d0Cym)zNqh^)Nn@W&`Pwv=Km+jqN=t~}~?H?|Gil*voqL+80{Q2tH z;Y8=s{iyJHa&V%s-g5ua^o!I)f7F7+R63pOpZQb#{=PnSueH(PF9|;e_I;;*|Rf+BmV$~SHSTA literal 0 HcmV?d00001 diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 5f9d9fdac11..6bfbc11d898 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -47,7 +47,13 @@
- + + + + + + +
  • From cf3f05d58b13cd6e32ba2ebcb1c710de078e70af Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 19 Oct 2012 11:10:52 +0530 Subject: [PATCH 007/264] [IMP]percentage in title. bzr revid: vme@tinyerp.com-20121019054052-valignwzrc4jao4v --- addons/web/static/src/js/chrome.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 3cb4437d1c3..62f55c439cf 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -236,6 +236,9 @@ instance.web.Loading = instance.web.Widget.extend({ this._super(parent); this.count = 0; this.blocked_ui = false; + this.old_title = document.title; + this.request_count = 0; + this.response_count = 0; this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); @@ -245,13 +248,19 @@ instance.web.Loading = instance.web.Widget.extend({ this._super(); }, request_call: function() { + this.request_count += 1; this.on_rpc_event(1); }, response_call: function() { + this.response_count += 1; this.on_rpc_event(-1); }, + loading_title:function(percentage){ + document.title = percentage + "% processed |" + this.old_title; + }, on_rpc_event : function(increment) { var self = this; + this.loading_title(parseInt(this.response_count * 100 / this.request_count)) if (!this.count && increment === 1) { // Block UI after 3s this.long_running_timer = setTimeout(function () { @@ -271,6 +280,7 @@ instance.web.Loading = instance.web.Widget.extend({ this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; + document.title = this.old_title; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { From 5cd85cdeb27615d406467b239dbb485d5b4c2a72 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 19 Oct 2012 11:36:36 +0530 Subject: [PATCH 008/264] [IMP]Improved. bzr revid: psa@tinyerp.com-20121019060636-c0ojx04izoh1v6ix --- addons/web_kanban/static/src/xml/web_kanban.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 6bfbc11d898..7e1ef68c632 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,11 +48,8 @@
    - - - - - + +
      From ba2697d34466fc19e5be5335a960ac4d6477c32f Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Fri, 19 Oct 2012 16:47:39 +0530 Subject: [PATCH 009/264] [IMP] Improved code for red button bounce effect when click on non-editable status bars bzr revid: pan@tinyerp.com-20121019111739-3snflq85acs4nxt6 --- addons/web/static/src/js/view_form.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d096e15b51d..19f68a575de 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -207,12 +207,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - this.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click', function (e) { - if((self.get("actual_mode") == "view")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); + $(".oe_highlight:not(.oe_form_invisible)").wrap(""); + $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { + // if((self.get("actual_mode") == "view")) { + var $button = $(".oe_highlight:not(.oe_form_invisible)")/*.css({'float':'left','white-space':'nowrap'})*/; $button.effect('bounce', {distance:18, times: 5}, 150); e.stopPropagation(); - } + // } }); this.trigger('form_view_loaded', data); return $.when(); From d6c28e5be7a0c4550d0e2b9cf8b241f52fb444a0 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Mon, 22 Oct 2012 10:48:02 +0530 Subject: [PATCH 010/264] [IMP]More clean code bzr revid: pan@tinyerp.com-20121022051802-forh9rhexkd2x2y0 --- addons/web/static/src/js/view_form.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9c5c40a321c..57620a9856f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -209,11 +209,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM //bounce effect on red button when click on statusbar. $(".oe_highlight:not(.oe_form_invisible)").wrap(""); $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { - // if((self.get("actual_mode") == "view")) { - var $button = $(".oe_highlight:not(.oe_form_invisible)")/*.css({'float':'left','white-space':'nowrap'})*/; + var $button = $(".oe_highlight:not(.oe_form_invisible)"); $button.effect('bounce', {distance:18, times: 5}, 150); e.stopPropagation(); - // } }); this.trigger('form_view_loaded', data); return $.when(); From 83bdf22d5f6b45851c7648010669fd7d90b2e9f9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Mon, 22 Oct 2012 10:59:06 +0530 Subject: [PATCH 011/264] [IMP] Improved code. bzr revid: psa@tinyerp.com-20121022052906-hdpilxhxcss6jwgm --- addons/web/static/src/img/infinity.gif | Bin 1049 -> 0 bytes addons/web/static/src/img/infinity.png | Bin 0 -> 2816 bytes addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 addons/web/static/src/img/infinity.gif create mode 100644 addons/web/static/src/img/infinity.png diff --git a/addons/web/static/src/img/infinity.gif b/addons/web/static/src/img/infinity.gif deleted file mode 100644 index 509f6846a49113f176fc439f78eedec21ca5fbf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1049 zcmbu8(Myz35XH}ChO#ERNfD9oxxQqSq(fw6AhOsN1R`vd^-vp*NC|?a6oiWzZWIyp z;)Mv6=wTsHf{<2%h#=w?5eY>ILeNVny+tqG&V2tu_hDg}nKQpR^X;+YJspQH?7=Sl z27)~wf(t=IkPu*z_rbg1HFyagmUKQi7n}ws!NF?P2X#R;s04+ziVxy~Xb=ekDh2oe z7oY(Wz<}D6rWTu74Vz=nd9U7!_pq^yobyh-6YpRYOsey$Ud1a6inZdrs2A}9GP2df zd8mhYa4M-OMrcwJi#ZOaHl?Y>X4pa&^Qm*<9Be<1Wu)pE9nO@*-bmh#D%#bsVPQib`pym987IW!%k$?Of%*KFGeG|AICBh z*vDbM#`m^ld_uE1zKYexMw{!gch(x)VMmBJG^H5YZW42ta4gNwfmfn=+-U@Y2AWe+_NN;RxtgfzBDwT4%Tq>2u$H(*ed^VfSWHRZrX*d0Cym)zNqh^)Nn@W&`Pwv=Km+jqN=t~}~?H?|Gil*voqL+80{Q2tH z;Y8=s{iyJHa&V%s-g5ua^o!I)f7F7+R63pOpZQb#{=PnSueH(PF9|;e_I;;*|Rf+BmV$~SHSTA diff --git a/addons/web/static/src/img/infinity.png b/addons/web/static/src/img/infinity.png new file mode 100644 index 0000000000000000000000000000000000000000..5424b856735eef58ef2049cf4a9a9df39008eed2 GIT binary patch literal 2816 zcmZ{mXHXO97KRfbK&YXGD!oV&Ab@TNhNe=5&>@i+LkU$#=m{t#G{H~=M5KxfDy2mk;OcXT-I zai~FueOy@ZaI%ruUm_TA#{M+m;8)#ze7oe(0aG3Du>fFu*slf#Q|)$snF&;zkVE}1 z575pwSwHk%I-a)iqD_xgB^UXSj|^Jvu{e*qJJeA?kd!}JxGR@gRP2)NBN!;(&x#%i zeu@|zVcys8rr%&ytOk~y3O0Fdd*t|YW0rfkCb!h#s_lYmp6DtImC*a+Yci2$R=xgY zscI``cJ3)9+kb8e-TP%dIjVQY)81*~ZmI;|0N_P>7$=N#`le#2fM6PyWV8nBP^5uh zfxh!iHpty_t`9WR1+1sVrlC2qIjvF(%kNhNr_)zBqnx?44Gvr)#E~Y=p1PYLlNOua zz#)*Nkz$QT;}-#DV#~l9p&CF9-$US!DK93ft|GmkV?qKW6+@lIz12F@UI}CPT7c7O z>3IuRqpL|3JSaEVrrlbH+DoeBB{S#@8yJ29X9hV2o;9Ko#@#g~)LbihK3p*rQI4N_ zi+7LF%1Ac>uF=`N-?;VrD0pTAw!?bOk2^2I8;Y&unMS=C$r$t;z(?tBctg^vZXIaQ zC|$l+*swO4>DA zq<7;svru?51Ypft{}{r!8y0f?Hq!^?d5<&i%8C%!$nBu1TOw!%fe?O%kbq1vtiSIo zlzUI{-O#$m>n>?mebvkBpc4@Q>zY&}1vOuN)dEw2&*9cTZ+cj^nW2zE3&*&-N)XJ@ z*2r620PI~5x58v}9Nw+T?oMARJ{MoIxqhC@>HzzE;Rj{|P=NK43$Z{YK$6N?_9bf2@ZN|%WRwHv~oZ?JdXb>27W==n13^E?;z=EBL*DWkJv|Z%yQU}eBhIG z{BC8xvFKxof)^7pB)Q<|!3H8JM`jx&L^7fdfeoLojEgY`5c7&0giw(7R|~Atv)jRQY9EsW zKeVW=m9O#y6KXDa3Z%l+`^>pV&ugFtAxT7?Yf^mmj%y$;moFx=j9#mURxE)9mhhHg zE-ZRpf=&GBexiN4d<=Y9y65rP5n(`6qF<0kA@>~POTF7bYLFncKbr2eQ-15&M>Ua8 zkgBH8J3X$!pM1R)f$C_kJ%}P(elFUO&r+?lE4w*+^n{jLe$mHTMy{}r?D+Kb@5z34 z@6*Jj3ANvt!r!F0FH0wfeN|P2Eg{CUD~v?-PK%Rk#Mk+HB~wy-f7n3rh~s9PHv>9J zu*-oh%M97l2iJh&lUAW|QXx!U7~> zcR@{}qo&QE`AbS7gbezbl5s3A;igsupny2INCh>bzd$8D^gce!$}3{4{5^=7aI8F# zozV>^GvWhx2sYtE{>DY>8>Bn+WuXF83+QKulger5t;df34iWzwXn*pjI%2#OO~3Qb z<3g5p9TAbhf=8$T!__Zpd|&LCg4A={+*`-vc;37+Z_iI; z+I}<9VVh@@{HB9Vr0qC<=kLQk!q?1lN=_-#YIjPt_RNO2& z#@To3B6y2n>79S{b2j4X`Pk^Mg^g-f>I$AXiBQ@Agc1zgu<8CPQjr=?39Tq9* zn(k{cuBUB~`BB_0>%Ml`P^3DpK|1_+p73M0wU?z!ec@eyst&fYw&Uu4yTq^;xZ<6z zTwW4b#H$u5ln|unS2_>IkAEsl(P+TDKSn&f$ZF!Oi_NY2*S=EN-cmd=tR_SkfA&)~ zQ5;r7JTStyTzVB}3akrh|JEQ(YlNeSA3e#}W@3rjA zp5J^QtMB+!{EX)aqQCpTSKeF^UB)TN`lfqA7BjZp2$cv<(HzAg?7d|e!zK|=CUato zze(Kaa;td!&ie2MAzn3(U@$TRGoaccZ@X(*mM=*V}rBhf$>`ajD z+xN5D5ixW787-_%6?i~5!ZS5$!T{!-z}&O8K+2dtDtnY#sGSnoiR_C|?ts!DcfdwF zH+p1o04yMwUp`l26JV7Aa7{XiU`3RG2KvGbC# zm?%Erp?AXg%oFkC1aq050Lq2(5~Ga6Fu>6kd%Eo; GiSZwO9{M2w literal 0 HcmV?d00001 diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 7e1ef68c632..091f30bfa11 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,7 +48,7 @@
      - +
      From c429019b5c56ce1a835f0854834fb935e6cb6407 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 22 Oct 2012 11:45:53 +0530 Subject: [PATCH 012/264] [IMP] Click on openerp element then close resolution dialog. bzr revid: bth@tinyerp.com-20121022061553-icx3zjy0n678bemm --- addons/web/static/src/js/chrome.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a039433f09b..41039749528 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -986,6 +986,10 @@ instance.web.WebClient = instance.web.Client.extend({ self.$el.on('contextmenu','.oe_logo',function(e) { instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); + + $(self.$el).click(function(){ + $('.resolution').dialog('close'); + }) $('.resolution a').click(function() { self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px"); self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px"); From 0e82e9aa172b7464681d66c5dd5f8025d0a14118 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Mon, 22 Oct 2012 18:48:42 +0530 Subject: [PATCH 013/264] Improved code for red_button_bounce effect bzr revid: pan@tinyerp.com-20121022131842-35qifgzyqkpviy4l --- addons/web/static/src/js/view_form.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 57620a9856f..5d7bf68920d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -207,13 +207,17 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - $(".oe_highlight:not(.oe_form_invisible)").wrap(""); - $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { - var $button = $(".oe_highlight:not(.oe_form_invisible)"); - $button.effect('bounce', {distance:18, times: 5}, 150); - e.stopPropagation(); - }); + this.on('load_record',this,function(){ + self.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { + if(self.get("actual_mode") == "view") { + var $button = $(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").wrap(""); + $button.effect('bounce', {distance:18, times: 5}, 150); + e.stopImmediatePropagation(); + } + }); + }) this.trigger('form_view_loaded', data); + return $.when(); }, widgetFocused: function() { From 17ce4c93b70b7e07059e306f57600dd2464d628f Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 22 Oct 2012 18:52:17 +0530 Subject: [PATCH 014/264] [IMP] css changes with sass. bzr revid: bth@tinyerp.com-20121022132217-13oz992sx88ouumn --- addons/web/static/src/css/base.css | 9 +++++---- addons/web/static/src/css/base.sass | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4dad3505d4b..b7952810c37 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2925,10 +2925,11 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } + .resolution table { - width: 100%; - line-height: 20px; + width: 100%; + line-height: 20px; } .resolution table td { - valign: middle; -} \ No newline at end of file + valign: middle; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a128fcec24b..f1176b3de40 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2313,5 +2313,10 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) +.resolution table + width: 100% + line-height: 20px + td + valign: middle // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 9121cb71b66c10b4cc15974417102efe065cbf3d Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 22 Oct 2012 18:59:25 +0530 Subject: [PATCH 015/264] [FIX]CSS changes with SASS bzr revid: vja@tinyerp.com-20121022132925-pijuxtt5z2icgrtj --- addons/web/static/src/css/base.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a128fcec24b..871d23d084e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -431,6 +431,10 @@ $sheet-max-width: 860px .oe_image_medium > img max-width: 180px max-height: 180px + .oe_view_manager_current .accessactive + text-decoration: underline + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) + font-weight: bold .oe_button.oe_link @include reset() img From 8351473832502b236f2232e6c7d2bc2a5c663a8f Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Tue, 23 Oct 2012 12:32:06 +0530 Subject: [PATCH 016/264] [IMP]Improved code for red_button bounce effecct on statusbar click bzr revid: pan@tinyerp.com-20121023070206-a5xbxbyut3ytgrs5 --- addons/web/static/src/js/view_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 30415be507f..7bb25d8bc4d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -206,10 +206,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - this.on('load_record',this,function(){ + this.on('load_record',this,function(){ + var $button = self.$el.find(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").css({'margin-left':'2px','float':'left','white-space':'nowrap'}); self.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { if(self.get("actual_mode") == "view") { - var $button = $(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").wrap(""); $button.effect('bounce', {distance:18, times: 5}, 150); e.stopImmediatePropagation(); } From 731ca3aaa3738c75f8ba724d816d7840f0f381ea Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 23 Oct 2012 14:08:56 +0530 Subject: [PATCH 017/264] [IMP]testing for chrome this code from runbot. bzr revid: vme@tinyerp.com-20121023083856-5jgq3dtdmp3e1m40 --- addons/web/static/src/js/chrome.js | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 62f55c439cf..fd3434e2105 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -242,6 +242,58 @@ instance.web.Loading = instance.web.Widget.extend({ this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); + this.draw_favicon(50); + }, + draw_favicon: function(percentage){ + var self = this; + var canvas = this.get_canvas(); + var faviconImage = new Image(); + var context = canvas.getContext("2d"); + faviconImage.onload = function() { + console.log("Image Loaded"); + if (context) { + context.clearRect(0, 0, 16, 16); + // Draw shadow + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false); + context.fillStyle = "red"; + context.fill(); + // Draw background + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false); + context.fillStyle = "yellow"; + context.fill(); + // Draw pie + if (percentage > 0) { + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false); + context.lineTo(canvas.width / 2, canvas.height / 2); + context.fillStyle = "white"; + context.fill(); + } + var link = document.createElement('link'); + link.type = 'image/x-icon'; + link.rel = 'icon'; + link.href = canvas.toDataURL(); + var src = $('link[type="image/x-icon"]').attr("href"); + if (!src.match(/^data/)) { + faviconImage.crossOrigin = 'anonymous'; + } + document.getElementsByTagName('head')[0].appendChild(link); + console.log("canvas to url",canvas.toDataURL()); + } + } + faviconImage.src = $('link[type="image/x-icon"]').attr("href"); + console.log("favicon",faviconImage); + }, + get_canvas: function(){ + canvas = document.createElement("canvas"); + canvas.width = 16; + canvas.height = 16; + return canvas; }, destroy: function() { this.on_rpc_event(-this.count); From 1ac38618d629c5af391909eca4a725ffcc992f1c Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 23 Oct 2012 14:59:45 +0530 Subject: [PATCH 018/264] [FIX]Improve code bzr revid: vja@tinyerp.com-20121023092945-4krp469jm3u5kzcy --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 2 +- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/xml/base.xml | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9384a3ed8f6..eb70b150d76 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -394,6 +394,10 @@ .openerp .oe_image_medium > img { max-width: 180px; max-height: 180px; } + .openerp .oe_view_manager_current .accessactive:first-letter{ + text-decoration:underline; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + font-weight:bold; } .openerp .oe_button.oe_link { border: none; padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0beaaf901cc..70a9898022c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -434,7 +434,7 @@ $sheet-max-width: 860px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current .accessactive + .oe_view_manager_current .accessactive:first-letter text-decoration: underline text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) font-weight: bold diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 61cf6c8f02e..4c74b55206c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -220,11 +220,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM widgetAccesskey:function(){ $(document).keydown(function(e){ if(e.keyCode === $.ui.keyCode.ALT) { - $("[accesskey] span").addClass('accessactive'); + $("[accesskey]").addClass('accessactive'); } e.stopPropagation(); }).keyup(function(e){ - $("[accesskey] span").removeClass('accessactive'); + $("[accesskey]").removeClass('accessactive'); }); }, widgetFocused: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 11f04e93d8b..caba50416ad 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -751,15 +751,15 @@
      - +
      + type="button" class="oe_button oe_form_button_create" accesskey="C">Create       - + or - Discard + Discard
From d31003fc4c96df3104b2e414d29870bda60d39fa Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Oct 2012 10:44:36 +0530 Subject: [PATCH 019/264] [IMP]Improved code for image set in old password and new password field bzr revid: ggh@tinyerp.com-20121029051436-r2j03sdzwg155beb --- addons/web/static/src/css/base.css | 12 ++++++++++-- addons/web/static/src/css/base.sass | 7 +++++++ addons/web/static/src/js/chrome.js | 2 ++ addons/web/static/src/xml/base.xml | 16 ++++++++-------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cbbd8e37f6c..5311a844f2f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; } @@ -45,7 +44,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 :-moz-placeholder { color: #afafb6 !important; @@ -527,6 +526,15 @@ .openerp .oe_grey { color: #aaaaaa; } +.openerp .oe_placeImage_old input { + background: url(/web/static/src/img/old_key.png) no-repeat 4px; +} +.openerp .oe_placeImage_new input { + background: url(/web/static/src/img/new_key.png) no-repeat 4px; +} +.openerp .oe_padding_left input { + padding-left: 22px; +} .openerp .oe_tag { border: 1px solid #afafb6; font-size: 11px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ef9a8a451d..3b91693ba8c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -462,6 +462,13 @@ $sheet-max-width: 860px // }}} + .oe_placeImage_old input + background: url(/web/static/src/img/old_key.png) no-repeat 4px + .oe_placeImage_new input + background: url(/web/static/src/img/new_key.png) no-repeat 4px + .oe_padding_left input + padding-left: 22px + // Tags (for many2many tags, among others) {{{ .oe_tag border: 1px solid $tag-border diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6cf35a14e92..48a95e98f1a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -329,6 +329,8 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); + self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px'); + self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9880abd20f7..530365a800f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -255,15 +255,15 @@ - + - + - +
@@ -291,17 +291,17 @@ - + - + - From 0243d319ea1f535bb84f7370fbc288829d5382e5 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Oct 2012 10:51:24 +0530 Subject: [PATCH 020/264] Add Images of old/new password key bzr revid: ggh@tinyerp.com-20121029052124-qumygdrw2eqqb8z2 --- addons/web/static/src/img/new_key.png | Bin 0 -> 392 bytes addons/web/static/src/img/old_key.png | Bin 0 -> 504 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/web/static/src/img/new_key.png create mode 100644 addons/web/static/src/img/old_key.png diff --git a/addons/web/static/src/img/new_key.png b/addons/web/static/src/img/new_key.png new file mode 100644 index 0000000000000000000000000000000000000000..9e167c3d54af7df5dad4576e0cd399ac15c07419 GIT binary patch literal 392 zcmV;30eAk1P)DcNCQc$E+;F3dg5WGpIymZqvru<8!NpMr5B~r+(aEn-H^D{haHTa(ny;o! zdTr%a*H{sy_O7-1gANHi&-=c8V;B{|crZzb*l`>vOw-iG4`Y6ZakOmI1;U_R21}A_ zrPNfVz_#I#K&ezG$?Nx-F?m_pKE|R`7BCj-I8J}ujTGdqwI~aZ>qe**BuUa{EIR$S zAPC|)O2hj)uxCS`b9GSh57Z(;0jU#s9zBnubbbi7ENdJ>yjBMTfS-hj&8q#cxGr(Z zP`7*X=KH~!=aDUh*aGL-%m|n+xh}paf|N#w`M&o#m%CvYuM(0>S5yvX0U$?3IDg8I zS(Z&0O@a{JE5fb|#YZ)*_1Ld)-um_nz`ZXxpY_J`*hZtuN)1~1O0Ej4!W+-@2r@K6-6P!5@N9!B9RC} zp%A>@U0hz~(d+fh0psx)4-b#9+wIK3Xf#Hn(LgX5gw19{CX+$G-~S(=>m$_b_gG!E zqgt&pN3+=snx-)~KHnbl`NIDI!!XclwU~qR^BlAM38CaU!DU7gLjn6B6fCs;P`ECR(fOI+o zerp>Wn;uxLR^)OQh{sQnOeU90q1k-K*;xV}4~Lr@k=bvzUqH{70vN`Ww5rQKO(3vO ugiSUFG?q%?b8uu?fhdY(mlwYJeSHAz7piCmUZ1%D0000 Date: Mon, 29 Oct 2012 13:35:46 +0530 Subject: [PATCH 021/264] [Imp] improved code bzr revid: ggh@tinyerp.com-20121029080546-mwi5wdcs6n1scol5 --- addons/web/static/src/css/base.css | 7 +++---- addons/web/static/src/css/base.sass | 6 +++--- addons/web/static/src/xml/base.xml | 14 +++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5311a844f2f..a96ce317276 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -526,13 +526,12 @@ .openerp .oe_grey { color: #aaaaaa; } -.openerp .oe_placeImage_old input { +.openerp .oe_keyImage_old_pwd input { background: url(/web/static/src/img/old_key.png) no-repeat 4px; + padding-left: 22px; } -.openerp .oe_placeImage_new input { +.openerp .oe_keyImage_new_pwd input { background: url(/web/static/src/img/new_key.png) no-repeat 4px; -} -.openerp .oe_padding_left input { padding-left: 22px; } .openerp .oe_tag { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3b91693ba8c..22289f088c6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -462,11 +462,11 @@ $sheet-max-width: 860px // }}} - .oe_placeImage_old input + .oe_keyImage_old_pwd input background: url(/web/static/src/img/old_key.png) no-repeat 4px - .oe_placeImage_new input + padding-left: 22px + .oe_keyImage_new_pwd input background: url(/web/static/src/img/new_key.png) no-repeat 4px - .oe_padding_left input padding-left: 22px // Tags (for many2many tags, among others) {{{ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 530365a800f..536c794c58d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -255,15 +255,15 @@
- + - + - +
@@ -291,18 +291,18 @@ - - - + From 5d6e4af5294ba96772a10a21ac4f1c5a2d15ed80 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 15:59:01 +0530 Subject: [PATCH 022/264] [IMP]implement favicon basis on percentage of request and response. bzr revid: vme@tinyerp.com-20121029102901-e3j6bmgbko94z0mz --- addons/web/static/src/js/chrome.js | 161 +++++++++++++++++------------ 1 file changed, 95 insertions(+), 66 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index fd3434e2105..39b93e0937a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -229,71 +229,18 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ }); }, }); - instance.web.Loading = instance.web.Widget.extend({ template: 'Loading', init: function(parent) { this._super(parent); + var self = this; this.count = 0; this.blocked_ui = false; - this.old_title = document.title; this.request_count = 0; this.response_count = 0; this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); - this.draw_favicon(50); - }, - draw_favicon: function(percentage){ - var self = this; - var canvas = this.get_canvas(); - var faviconImage = new Image(); - var context = canvas.getContext("2d"); - faviconImage.onload = function() { - console.log("Image Loaded"); - if (context) { - context.clearRect(0, 0, 16, 16); - // Draw shadow - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false); - context.fillStyle = "red"; - context.fill(); - // Draw background - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false); - context.fillStyle = "yellow"; - context.fill(); - // Draw pie - if (percentage > 0) { - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false); - context.lineTo(canvas.width / 2, canvas.height / 2); - context.fillStyle = "white"; - context.fill(); - } - var link = document.createElement('link'); - link.type = 'image/x-icon'; - link.rel = 'icon'; - link.href = canvas.toDataURL(); - var src = $('link[type="image/x-icon"]').attr("href"); - if (!src.match(/^data/)) { - faviconImage.crossOrigin = 'anonymous'; - } - document.getElementsByTagName('head')[0].appendChild(link); - console.log("canvas to url",canvas.toDataURL()); - } - } - faviconImage.src = $('link[type="image/x-icon"]').attr("href"); - console.log("favicon",faviconImage); - }, - get_canvas: function(){ - canvas = document.createElement("canvas"); - canvas.width = 16; - canvas.height = 16; - return canvas; }, destroy: function() { this.on_rpc_event(-this.count); @@ -307,12 +254,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.response_count += 1; this.on_rpc_event(-1); }, - loading_title:function(percentage){ - document.title = percentage + "% processed |" + this.old_title; - }, on_rpc_event : function(increment) { var self = this; - this.loading_title(parseInt(this.response_count * 100 / this.request_count)) if (!this.count && increment === 1) { // Block UI after 3s this.long_running_timer = setTimeout(function () { @@ -323,16 +266,10 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { - if (instance.session.debug) { - this.$el.text(_.str.sprintf( _t("Loading (%d)"), this.count)); - } else { - this.$el.text(_t("Loading")); - } - this.$el.show(); + this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; - document.title = this.old_title; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { @@ -341,10 +278,102 @@ instance.web.Loading = instance.web.Widget.extend({ } this.$el.fadeOut(); this.getParent().$el.removeClass('oe_wait'); + this.stop_favicon(); } } }); - +instance.web.favicon = instance.web.Loading.include({ + init: function(parent){ + this._super(parent); + var self = this; + this.original_favi = $('link[type="image/x-icon"]'); + this.canvas = null; + this.link = null; + this.interval = null; + this.old_title = document.title; + this.local_counter = 0; + this.options = { + 'border':"white", + 'background' :"gray", + 'inner_circle':"white", + 'fill_color':"red", + 'width': 5 + } + }, + start_favicon: function(second, options){ + var count = 0; + var self = this; + this.interval = setInterval(function(){ + if (++count > 100) {self.stop_favicon(); return false;} + self.draw_favicon(count, options); + }, second || 1); + }, + stop_favicon: function(){ + if(this.interval) + clearInterval(this.interval); + $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); + $('head').append(this.original_favi); + document.title = this.old_title; + }, + loading_title:function(percentage){ + document.title = percentage + "% processed |" + this.old_title; + }, + draw_favicon: function(percentage, options){ + var self = this; + var options = _.extend(this.options, options || {}); + var get_canvas = function(){ + if(!this.canvas){ + this.canvas = document.createElement("canvas"); + this.canvas.width = 16; + this.canvas.height = 16; + } + return this.canvas; + }; + var get_link = function(canvas_url){ + if(!this.link) + this.link = $('').attr({ type : 'image/x-icon',rel : 'icon'}); + $(this.link).attr('href',canvas_url); + return this.link; + }; + var canvas = get_canvas(); + var src = self.original_favi.attr("href"); + var faviconImage = new Image(); + var context = canvas.getContext("2d"); + var draw_context = function(context, x, y, r, sAngle, eAngle, counterclockwise ,color){ + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(x, y, r, sAngle, eAngle, counterclockwise); + context.fillStyle = color ; + context.fill(); + return context + } + faviconImage.onload = function() { + if (context) { + context.clearRect(0, 0, 16, 16); + // Draw shadow + draw_context(context,canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) + 2, 0, Math.PI * 2, false ,options.border) + // Draw background + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , 0, Math.PI * 2, false,options.background) + // Draw pie + if (percentage > 0) { + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false,options.fill_color); + context.lineTo(canvas.width / 2, canvas.height / 2) + } + //Inner Circle + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - options.width, 0, Math.PI * 2, false, options.inner_circle) + if (!src.match(/^data/)) { + faviconImage.crossOrigin = 'anonymous'; + } + if(self.count > 0 ){ + $('link[type="image/x-icon"]').remove(); + $('head').append(get_link(canvas.toDataURL())); + } + } + } + this.loading_title(percentage); + faviconImage.src = self.original_favi.attr("href"); + }, +}); instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { this._super(parent); From a5505925bd63ea7885b3221b282401a495deaf56 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:27:10 +0530 Subject: [PATCH 023/264] [IMP]minor change. bzr revid: vme@tinyerp.com-20121029115710-kpcfose7n8q749tm --- addons/web/static/src/js/chrome.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 0b2ac1db7c7..2478ae954e6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -266,8 +266,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { + this.favicon_drawable = true; this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); - this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; clearTimeout(this.long_running_timer); @@ -276,8 +276,6 @@ instance.web.Loading = instance.web.Widget.extend({ this.blocked_ui = false; instance.web.unblockUI(); } - this.$el.fadeOut(); - this.getParent().$el.removeClass('oe_wait'); this.stop_favicon(); } } @@ -292,32 +290,40 @@ instance.web.favicon = instance.web.Loading.include({ this.interval = null; this.old_title = document.title; this.local_counter = 0; + this.favicon_drawable = true; this.options = { - 'border':"white", - 'background' :"gray", - 'inner_circle':"white", - 'fill_color':"red", - 'width': 5 + 'border':"white",//border of favicon + 'background' :"gray",//main color of circle + 'inner_circle':"white",//innter circle color + 'fill_color':"red",//fill color + 'width': 5 //width of circle } }, + + //when time interval is known than start favicon can be used. start_favicon: function(second, options){ var count = 0; var self = this; this.interval = setInterval(function(){ if (++count > 100) {self.stop_favicon(); return false;} + self.favicon_drawable = true; self.draw_favicon(count, options); }, second || 1); }, + stop_favicon: function(){ if(this.interval) clearInterval(this.interval); + this.favicon_drawable = false; $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); $('head').append(this.original_favi); document.title = this.old_title; }, + loading_title:function(percentage){ document.title = percentage + "% processed |" + this.old_title; }, + draw_favicon: function(percentage, options){ var self = this; var options = _.extend(this.options, options || {}); @@ -364,7 +370,7 @@ instance.web.favicon = instance.web.Loading.include({ if (!src.match(/^data/)) { faviconImage.crossOrigin = 'anonymous'; } - if(self.count > 0 ){ + if(self.favicon_drawable){ $('link[type="image/x-icon"]').remove(); $('head').append(get_link(canvas.toDataURL())); } @@ -372,7 +378,7 @@ instance.web.favicon = instance.web.Loading.include({ } this.loading_title(percentage); faviconImage.src = self.original_favi.attr("href"); - }, + } }); instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { From 5e4b67c1a3d8799c9d7a32b97039e6823b4936a8 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:32:13 +0530 Subject: [PATCH 024/264] [IMP]check if interval presents then first stop that. bzr revid: vme@tinyerp.com-20121029120213-61uy6frqo0ormdc6 --- addons/web/static/src/js/chrome.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 2478ae954e6..821ed2d0fa6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -302,6 +302,8 @@ instance.web.favicon = instance.web.Loading.include({ //when time interval is known than start favicon can be used. start_favicon: function(second, options){ + if(!this.interval) + this.stop_favicon(); var count = 0; var self = this; this.interval = setInterval(function(){ @@ -318,6 +320,7 @@ instance.web.favicon = instance.web.Loading.include({ $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); $('head').append(this.original_favi); document.title = this.old_title; + this.interval = null; }, loading_title:function(percentage){ From a7bee43a5b13b92267707c1514cc610bb5fa2fd3 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:43:13 +0530 Subject: [PATCH 025/264] [IMP] bzr revid: vme@tinyerp.com-20121029121313-v12kb501m6vzi9c2 --- addons/web/static/src/js/chrome.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 821ed2d0fa6..6cc416f448e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -270,6 +270,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); } else { this.count = 0; + this.request_count = 0; + this.response_count = 0; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { From 5ea001c82c519e8b8ddbb75d8ea2a53756ba3779 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:52:18 +0530 Subject: [PATCH 026/264] [REM]unused variable. bzr revid: vme@tinyerp.com-20121029122218-yuv3o313upbkfkuq --- addons/web/static/src/js/chrome.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6cc416f448e..1255e61e7dc 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -233,7 +233,6 @@ instance.web.Loading = instance.web.Widget.extend({ template: 'Loading', init: function(parent) { this._super(parent); - var self = this; this.count = 0; this.blocked_ui = false; this.request_count = 0; @@ -291,7 +290,6 @@ instance.web.favicon = instance.web.Loading.include({ this.link = null; this.interval = null; this.old_title = document.title; - this.local_counter = 0; this.favicon_drawable = true; this.options = { 'border':"white",//border of favicon From 4fa267f1fc39b70c58f81341292d2976c9aa9303 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 11:22:02 +0530 Subject: [PATCH 027/264] [IMP] add code for confirm pwd image bzr revid: ggh@tinyerp.com-20121030055202-epuold0yrsoukw3f --- addons/web/static/src/img/new_key.png | Bin 392 -> 266 bytes addons/web/static/src/img/old_key.png | Bin 504 -> 666 bytes addons/web/static/src/js/chrome.js | 1 + addons/web/static/src/xml/base.xml | 10 +++++----- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/img/new_key.png b/addons/web/static/src/img/new_key.png index 9e167c3d54af7df5dad4576e0cd399ac15c07419..ac7c7807bd52257ba0c03d26e7092645471976eb 100644 GIT binary patch delta 239 zcmVs#7KULUlXLFAZQCOV zfI7-I;6-_N+cw{;0nO1&W1iZ}XpE&*-Zen5OXIFlei(`Yn5A-$o9*`sn4UC-` pPhHnE@xL<1aZCWV`S`nXy*tXc@$Rz`yMq7#002ovPDHLkV1iSCX@~#- delta 366 zcmV-!0g?WS0*C{UBYy!;NklDcNCQc$E+;F3dg5WGpIymZqvru<8 z!NpMr5B~r+(aEn-H^D{haHTa(ny;o!dTr%a*H{sy_O7-1gANHi&-=c8V;B{|crZzb z*l`>vOw-iG4`Y6ZakOmI1;U_R21}A_rPNfVz_#I#K&ezG$$#tjnK5};**?aiQx-55 z>Nrk++>I3Et+gl%kLyOL6(mX0W-L1Ww;%}OIZDI(I&74Q4$}U6324=!F8}}l M07*qoM6N<$f{qKXeE$U#Sft6f$~X=S>uYI{ekSX?iLhWg=eAZnr9)-XPi$I)YLAi@L4?i zMa1S0p!j^N1 zQn`~CFAJEOdWxl`@2W@Ki}N2pU{_=hwl;+jiN~BxsEb@YBwDpr@^$2y!Vz68(dI~B z&ceSY0ODJX?cru4!W+-@2r@K6-6P!5@N9!B9RC}p%A>@U0hz~(d+fh0e|E17!MDRu-om-!Duu_ zqtQSx7=+DcLnf0!zu*5Kpz9;l>-Sh)wWC_CGDox744S4fH$LAU^7+F50K+iQYPFby z^Ya|D{0X7(gM&jP5()Dfbh}+R91d747DS^bczS9wC{5+)=or~-_HO_ctE!6I+Zs5I zgWK(9;c~g)bbmV8E(lj7o#Af)wJ6Ifip3Imo=2ziipgX`iaLQLDa1jCz%_Da{Okf1 z(ohtQv@MQsI7}`Mh?|+&sC)rv(IiQQ-|t5%l_nr{4qXVKJ+9XqBwrra*JZrDNef?| z0|tY4l*=M^c6{LYZLF=Wlj$om=u&`mIs<-d8ylM*SXixA5?$4`+=CYMX0*?h*? zSppsphnpLb*>AUBK+l%~7{-*es>?o2Ah1t_O*RKKmP+AsaAaA5D2im47ry#^eE{qi Vs%QpYpSb`4002ovPDHLkV1f-N+ - +
@@ -295,14 +295,14 @@ minlength="1" placeholder=" Password..." autofocus="autofocus"/> - - + - + From f1493bb606093de18062d8543db198963c7945e6 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 15:00:59 +0530 Subject: [PATCH 028/264] [IMP] code for password field bzr revid: ggh@tinyerp.com-20121030093059-xiuoh4ph03ytz88t --- addons/web/static/src/css/base.css | 5 ++--- addons/web/static/src/css/base.sass | 5 ++--- addons/web/static/src/js/chrome.js | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a96ce317276..75ca1270238 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,3 @@ -@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -527,11 +526,11 @@ color: #aaaaaa; } .openerp .oe_keyImage_old_pwd input { - background: url(/web/static/src/img/old_key.png) no-repeat 4px; + background: url(/web/static/src/img/old_key.png) no-repeat 4px !important; padding-left: 22px; } .openerp .oe_keyImage_new_pwd input { - background: url(/web/static/src/img/new_key.png) no-repeat 4px; + background: url(/web/static/src/img/new_key.png) no-repeat 4px !important; padding-left: 22px; } .openerp .oe_tag { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 22289f088c6..93deeec6398 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,4 +1,3 @@ -@charset "utf-8" // Variables {{{ $facets-border: #afafb6 @@ -463,10 +462,10 @@ $sheet-max-width: 860px // }}} .oe_keyImage_old_pwd input - background: url(/web/static/src/img/old_key.png) no-repeat 4px + background: url(/web/static/src/img/old_key.png) no-repeat 4px !important padding-left: 22px .oe_keyImage_new_pwd input - background: url(/web/static/src/img/new_key.png) no-repeat 4px + background: url(/web/static/src/img/new_key.png) no-repeat 4px !important padding-left: 22px // Tags (for many2many tags, among others) {{{ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index c47e7066726..6cf35a14e92 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -329,9 +329,6 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); - self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px'); - self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); - self.$el.find("form td input[name=confirm_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", From 9c1f3a394b04503d20dbd9ae3f44cca2f1828e13 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 15:04:51 +0530 Subject: [PATCH 029/264] add code for remove line bzr revid: ggh@tinyerp.com-20121030093451-u77xm5fx9krcmo5w --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 75ca1270238..90c7603c097 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,3 +1,4 @@ +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 93deeec6398..b4be8931f87 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,3 +1,4 @@ +@charset "utf-8" // Variables {{{ $facets-border: #afafb6 From c470df6de059f7ebe267fdae8bae3b638c721212 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 5 Nov 2012 11:23:20 +0530 Subject: [PATCH 030/264] [FIX]Improve code bzr revid: vja@tinyerp.com-20121105055320-jrplij0m8y6y2m3e --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 059b51b183e..91793947836 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -475,6 +475,10 @@ max-width: 180px; max-height: 180px; } +.openerp .oe_view_manager_current a.accessactive { + display:inline-block; + text-decoration:none; +} .openerp .oe_view_manager_current .accessactive:first-letter{ text-decoration:underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b96321a78f4..0c17735cf7b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -437,10 +437,14 @@ $sheet-padding: 16px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current .accessactive:first-letter - text-decoration: underline - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) - font-weight: bold + .openerp .oe_view_manager_current + a.accessactive + display: inline-block + text-decoration: none + .accessactive:first-letter + text-decoration: underline + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) + font-weight: bold .oe_button.oe_link @include reset() img From 395ee2bc8ec4b82f13441ed6bb9d2c2aaf074cd2 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Mon, 5 Nov 2012 11:33:10 +0530 Subject: [PATCH 031/264] [FIX]:Remove selection widget and add ir.action.todo bzr revid: aja@tinyerp.com-20121105060310-s3uw9o6vmjz37xwu --- addons/crm/crm_lead_view.xml | 4 ++-- addons/marketing/res_config_view.xml | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 5ff1bc15f69..8afe169c964 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -210,7 +210,7 @@ - + @@ -496,7 +496,7 @@ - + diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml index 78144843f82..73095a690db 100644 --- a/addons/marketing/res_config_view.xml +++ b/addons/marketing/res_config_view.xml @@ -1,5 +1,19 @@ + + + + Open Marketing Menu + reload + + + + + + open + + + From b2965827dc6a43e292e18ec68a18ea5f10824921 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 5 Nov 2012 12:05:18 +0530 Subject: [PATCH 032/264] [FIX]shortcut should highlight when press SHIFT + ALT. bzr revid: vja@tinyerp.com-20121105063518-ng3qk7ljjxmbtuvi --- addons/web/static/src/js/view_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ed088e50d96..f67ab33d6e8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -222,8 +222,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, widgetAccesskey:function(){ $(document).keydown(function(e){ - if(e.keyCode === $.ui.keyCode.ALT) { + if(e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { $("[accesskey]").addClass('accessactive'); + }else { + $("[accesskey]").removeClass('accessactive'); } e.stopPropagation(); }).keyup(function(e){ From dd12cbe1b6b284a00ec78efe54f25bc44cef2345 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Mon, 5 Nov 2012 15:16:02 +0530 Subject: [PATCH 033/264] [IMP] Selection field with placeholder feature. bzr revid: tta@openerp.com-20121105094602-v2a4z4m4mighxgqw --- addons/web/static/src/xml/base.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 275d31a9fde..d4b8674430e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -993,6 +993,7 @@ + From c370fe0f776880c73a07e36065287df2b81e8c4f Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 5 Nov 2012 16:33:25 +0530 Subject: [PATCH 034/264] [IMP]crm:filter strings changes bzr revid: kbh@tinyerp.com-20121105110325-txozs9k2nvzl31ai --- addons/crm/crm_action_rule_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml index 85cb8de1ac9..b62d6676d23 100644 --- a/addons/crm/crm_action_rule_demo.xml +++ b/addons/crm/crm_action_rule_demo.xml @@ -43,7 +43,7 @@ Thanks, - Filter on leads which are draft. + Draft Leads crm.lead [('state','=','draft')] @@ -61,7 +61,7 @@ Thanks, - Filter on leads which come from USA. + Leads from USA crm.lead [('country_id','=','United States')] From b9f6416dff0d278fa5ad575fdf147215d07e7144 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 5 Nov 2012 17:12:28 +0530 Subject: [PATCH 035/264] [IMP]plugin_thunderbird:close button added in wizard bzr revid: kbh@tinyerp.com-20121105114228-y6mi8fazyghryumr --- addons/plugin_thunderbird/plugin_thunderbird.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 5ea5fc38219..bb24a0b5957 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -10,7 +10,9 @@
Install Thunderbird Plug-In
- + +
+ -