From ecdb0de440fbfc4aad4529e17fe3e8a718c1e088 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 14:42:25 +0530 Subject: [PATCH 01/14] [IMP] Improved code for the switch view buttons which are not aligned properly in FF. bzr revid: psa@tinyerp.com-20130208091225-rrr4p36fes3awyh3 --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6cfee50d6a4..fee749a8d7c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -3088,6 +3088,12 @@ color: #333333; } +@-moz-document url-prefix() { + .openerp .oe_view_manager .oe_view_manager_switch li { + line-height: 21px; + } +} + .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); background-size: cover; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b4665808caf..54c3a529397 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2434,6 +2434,10 @@ $sheet-padding: 16px float: right color: #333 // }}} +@-moz-document url-prefix() + .openerp .oe_view_manager .oe_view_manager_switch li + line-height: 21px + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) From 386fbb2e6e35b273a1303789eaf55c5d38014c61 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 16:12:44 +0530 Subject: [PATCH 02/14] [IMP] Improved code for the 'STATE' selection box which is not aligned properly in FF. bzr revid: psa@tinyerp.com-20130208104244-24jvu7s0c6t0xfsr --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 8 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fee749a8d7c..e64f569f72a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3314,6 +3314,11 @@ div.ui-widget-overlay { overflow: hidden !important; } } +@media { + .openerp .oe_form .oe_form_field { + display: -moz-stack; + } +} .blockUI.blockOverlay { background-color: black; opacity: 0.6; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 54c3a529397..5307323007a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2623,6 +2623,9 @@ div.ui-widget-overlay .openerp div.oe_mail_wall overflow: hidden !important // }}} ++@media + .openerp .oe_form .oe_form_field + display: -moz-stack .blockUI.blockOverlay background-color: black From 302eb020b4eb85c749d93582b0e2188f21ffa935 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 16:28:10 +0530 Subject: [PATCH 03/14] [IMP] Searchview icon of searchbox is not centered in FF. bzr revid: psa@tinyerp.com-20130208105810-f0zulx88uiafx4jk --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e64f569f72a..d53f18b59aa 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3092,6 +3092,9 @@ .openerp .oe_view_manager .oe_view_manager_switch li { line-height: 21px; } + .openerp .oe_searchview .oe_searchview_search { + top: 0px; + } } .kitten-mode-activated { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5307323007a..e2c79475179 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2435,8 +2435,11 @@ $sheet-padding: 16px color: #333 // }}} @-moz-document url-prefix() - .openerp .oe_view_manager .oe_view_manager_switch li - line-height: 21px + .openerp + .oe_view_manager .oe_view_manager_switch li + line-height: 21px + .oe_searchview .oe_searchview_search + top: 0px // Kitten Mode {{{ .kitten-mode-activated @@ -2623,7 +2626,7 @@ div.ui-widget-overlay .openerp div.oe_mail_wall overflow: hidden !important // }}} -+@media +@media .openerp .oe_form .oe_form_field display: -moz-stack From db3b417c77334001f0c8aac00bb8540f4776969d Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 16:43:53 +0530 Subject: [PATCH 04/14] [REV] Reverted the changes commited in revno. 3681. bzr revid: psa@tinyerp.com-20130208111353-fehs9tdihpnhue0s --- addons/web/static/src/css/base.css | 5 ----- addons/web/static/src/css/base.sass | 3 --- 2 files changed, 8 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d53f18b59aa..97bec47d0a7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3317,11 +3317,6 @@ div.ui-widget-overlay { overflow: hidden !important; } } -@media { - .openerp .oe_form .oe_form_field { - display: -moz-stack; - } -} .blockUI.blockOverlay { background-color: black; opacity: 0.6; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e2c79475179..7e467281e44 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2626,9 +2626,6 @@ div.ui-widget-overlay .openerp div.oe_mail_wall overflow: hidden !important // }}} -@media - .openerp .oe_form .oe_form_field - display: -moz-stack .blockUI.blockOverlay background-color: black From a573347b407d1f318fb16e503006ffca4722c44e Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 17:15:15 +0530 Subject: [PATCH 05/14] [IMP] M2O icon in form view is not aligned properly in FF. bzr revid: psa@tinyerp.com-20130208114515-4jgvmua6lg4e24un --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 97bec47d0a7..d7aeb6125d4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3095,6 +3095,9 @@ .openerp .oe_searchview .oe_searchview_search { top: 0px; } + .openerp .oe_form_field_many2one .oe_m2o_cm_button { + line-height: 18px; + } } .kitten-mode-activated { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7e467281e44..edc3b505ffe 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2440,6 +2440,8 @@ $sheet-padding: 16px line-height: 21px .oe_searchview .oe_searchview_search top: 0px + .oe_form_field_many2one .oe_m2o_cm_button + line-height: 18px // Kitten Mode {{{ .kitten-mode-activated From d309b71b38d2bd963f78081e806683cf97b426e6 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 8 Feb 2013 18:28:21 +0530 Subject: [PATCH 06/14] [IMP] Leftbar's 'submenu' are not aligned properly in FF. bzr revid: psa@tinyerp.com-20130208125821-ryflms8qd8n9jyt8 --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d7aeb6125d4..ff166618dee 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3098,6 +3098,9 @@ .openerp .oe_form_field_many2one .oe_m2o_cm_button { line-height: 18px; } + .openerp .oe_secondary_submenu { + line-height: 14px; + } } .kitten-mode-activated { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index edc3b505ffe..285e80ecf32 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2442,6 +2442,8 @@ $sheet-padding: 16px top: 0px .oe_form_field_many2one .oe_m2o_cm_button line-height: 18px + .oe_secondary_submenu + line-height: 14px // Kitten Mode {{{ .kitten-mode-activated From 5f93bd9b2f44472d705f39f3eaa881339a241b62 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Mon, 11 Feb 2013 11:30:41 +0530 Subject: [PATCH 07/14] [IMP]Shortcut icon is little bit upwards than normal in FF. bzr revid: psa@tinyerp.com-20130211060041-v39hzun68tii0104 --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ff166618dee..79b76560692 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3101,6 +3101,9 @@ .openerp .oe_secondary_submenu { line-height: 14px; } + .openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { + top: 0px; + } } .kitten-mode-activated { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 285e80ecf32..66e6653da73 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2444,6 +2444,9 @@ $sheet-padding: 16px line-height: 18px .oe_secondary_submenu line-height: 14px + .oe_webclient + .oe_star_on, .oe_star_off + top: 0px // Kitten Mode {{{ .kitten-mode-activated From 79da93f42563cdbe10deb805b59e70068e7f9cbf Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Tue, 12 Feb 2013 11:52:14 +0530 Subject: [PATCH 08/14] [IMP]Improved code for the 'STATE' selection box which is not aligned properly in FF. bzr revid: psa@tinyerp.com-20130212062214-ch3wo5cadzzosdy3 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 79b76560692..ed00dc25466 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2323,6 +2323,7 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; + vertical-align: top; } .openerp .oe_form .oe_form_field input { margin: 0px; @@ -2366,7 +2367,6 @@ white-space: nowrap; } .openerp .oe_form .oe_form_field_boolean { - padding-top: 4px; width: auto; } .openerp .oe_form .oe_datepicker_container { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 66e6653da73..aeb7250bae8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1845,6 +1845,7 @@ $sheet-padding: 16px width: 100% display: inline-block padding: 2px 2px 2px 0px + vertical-align: top input margin: 0px input[type="text"], input[type="password"], input[type="file"], select @@ -1872,7 +1873,6 @@ $sheet-padding: 16px .oe_form_field_datetime white-space: nowrap .oe_form_field_boolean - padding-top: 4px width: auto .oe_datepicker_container display: none From e243bd2fc9535989a5d2f39d422a69956c9d404b Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Tue, 12 Feb 2013 16:15:55 +0530 Subject: [PATCH 09/14] [IMP] In Pricelist form view 'Active' boolean field is not viewed properly. bzr revid: psa@tinyerp.com-20130212104555-3qgi9rte6ow4ljdl --- 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 ed00dc25466..14242863fc6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2233,6 +2233,7 @@ line-height: 18px; display: block; min-width: 140px; + float: right; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding: 2px 0 2px 8px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index aeb7250bae8..2cef009853b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1769,6 +1769,7 @@ $sheet-padding: 16px line-height: 18px display: block min-width: 140px + float: right td.oe_form_group_cell + .oe_form_group_cell padding: 2px 0 2px 8px .oe_form_group From f8fd55be7aaa383fc4faa52bb7227528574ace38 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 14 Feb 2013 15:10:33 +0530 Subject: [PATCH 10/14] [IMP]Little change for the position of searchview icon for FF. bzr revid: psa@tinyerp.com-20130214094033-veyfumyiq9w7haf0 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 14242863fc6..5fd51b4ebb8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3094,7 +3094,7 @@ line-height: 21px; } .openerp .oe_searchview .oe_searchview_search { - top: 0px; + top: -1px; } .openerp .oe_form_field_many2one .oe_m2o_cm_button { line-height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2cef009853b..784d65f6610 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2440,7 +2440,7 @@ $sheet-padding: 16px .oe_view_manager .oe_view_manager_switch li line-height: 21px .oe_searchview .oe_searchview_search - top: 0px + top: -1px .oe_form_field_many2one .oe_m2o_cm_button line-height: 18px .oe_secondary_submenu From b7ce267cbc32c192ab960b1ba8be44d63ec2ba13 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 15 Feb 2013 16:39:27 +0530 Subject: [PATCH 11/14] [IMP] Improve code to fix issue in editing list for m2m field. bzr revid: bth@tinyerp.com-20130215110927-eu4n0sk21czcymwp --- addons/web/static/src/js/view_form.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4880b3882ff..703ef27f1c3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4094,6 +4094,13 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in focus: function () { this.$text[0].focus(); }, + set_dimensions: function (height, width) { + this._super(height, width); + this.$("textarea").css({ + width: width, + minHeight: height + }); + }, }); /** From 4527e79caaaf7cc4626d43c4f1973135eb4063a1 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 15 Feb 2013 16:55:14 +0530 Subject: [PATCH 12/14] [IMP] Set focus click on field or arrow. bzr revid: bth@tinyerp.com-20130215112514-xucy07vc41dtdycf --- 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 703ef27f1c3..c615f972502 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3047,9 +3047,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc this.$input.keydown(input_changed); this.$input.change(input_changed); this.$drop_down.click(function() { + self.$input.focus(); if (self.$input.autocomplete("widget").is(":visible")) { - self.$input.autocomplete("close"); - self.$input.focus(); + self.$input.autocomplete("close"); } else { if (self.get("value") && ! self.floating) { self.$input.autocomplete("search", ""); From 941457dad2db84002c828faac9fc26c8af21011d Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 18 Feb 2013 17:55:26 +0530 Subject: [PATCH 13/14] [IMP]Put % Instead px in css. bzr revid: bth@tinyerp.com-20130218122526-84m9mc9oyrn1596j --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5fd51b4ebb8..0ac45fb9567 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2330,7 +2330,7 @@ margin: 0px; } .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { - height: 22px; + height: 22%; padding-top: 2px; } .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 784d65f6610..77c781e1f89 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1850,7 +1850,7 @@ $sheet-padding: 16px input margin: 0px input[type="text"], input[type="password"], input[type="file"], select - height: 22px + height: 22% padding-top: 2px input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border) From f05be9414283636214e64f42672f4ea492ee5b3f Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Tue, 19 Feb 2013 18:36:42 +0530 Subject: [PATCH 14/14] [IMP] Improved code. bzr revid: psa@tinyerp.com-20130219130642-maynhem56frad76m --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0ac45fb9567..5fd51b4ebb8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2330,7 +2330,7 @@ margin: 0px; } .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { - height: 22%; + height: 22px; padding-top: 2px; } .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 77c781e1f89..784d65f6610 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1850,7 +1850,7 @@ $sheet-padding: 16px input margin: 0px input[type="text"], input[type="password"], input[type="file"], select - height: 22% + height: 22px padding-top: 2px input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border)