From a4e5ef3bd1d962df6457f6e248f01516f101a066 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:16:59 +0200 Subject: [PATCH 1/5] [IMP] Opportunities form view: use
for buttons, highlight first action button in topbar bzr revid: fme@openerp.com-20120516111659-zlc768ymthbyedjr --- addons/crm/crm_lead_view.xml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 44e866a3341..ca193cc48e1 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -400,7 +400,7 @@ 20
-
+
- - -
From 33c304d53154d09b20d0689717f0a17c57f63b50 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:18:41 +0200 Subject: [PATCH 2/5] [IMP] Labels in bold bzr revid: fme@openerp.com-20120516111841-85xn2ghpbm15gjsr --- addons/web/static/src/css/base.css | 6 +++++- addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5d2102630cb..b2c4066a2c7 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"); @@ -117,6 +117,9 @@ float: right; margin-left: 8px; } +.openerp .oe_text_right { + text-align: right; +} .openerp .oe_clear { clear: both; } @@ -1546,6 +1549,7 @@ padding: 0; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { + font-weight: bold; white-space: nowrap; padding-right: 8px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 567732ed080..411e345bc9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -143,6 +143,8 @@ $colour4: #8a89ba .oe_right float: right margin-left: 8px + .oe_text_right + text-align: right .oe_clear clear: both .oe_wait @@ -1265,6 +1267,7 @@ $colour4: #8a89ba // FormView.label {{{ .oe_form .oe_form_label_help[for], .oe_form_label[for] + font-weight: bold white-space: nowrap padding-right: 8px span From c8838959cf64fd673ab9703cfb1d5bbcf6d3357a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:25:34 +0200 Subject: [PATCH 3/5] [IMP] Opportunities form view: add a clear element in case actions buttons are all hidden bzr revid: fme@openerp.com-20120516112534-suwavwiiohusvq3a --- addons/crm/crm_lead_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index ca193cc48e1..9c3bd07562c 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -411,6 +411,7 @@
+
From 0261542d19c611a6d056df27ae3fa4da33499a01 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 14:50:32 +0200 Subject: [PATCH 4/5] [REM] Removed autolayout css class bzr revid: fme@openerp.com-20120516125032-t1wnomvppdbobuhv --- addons/web/static/src/css/base.css | 58 +++++++++++++-------------- addons/web/static/src/css/base.sass | 33 ++++++++------- addons/web/static/src/js/view_form.js | 3 -- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b2c4066a2c7..2c763be0643 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1418,7 +1418,7 @@ } .openerp .oe_form_topbar button { font-size: 12px; - height: 24px; + height: 24px !important; line-height: 24px; vertical-align: top; padding: 0 10px; @@ -1511,41 +1511,26 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } -.openerp .oe_form_autolayout .oe_button { - height: 20px; -} -.openerp .oe_form_autolayout .oe_form_group_cell { +.openerp .oe_form .oe_form_group_cell { line-height: 18px; padding: 2px; height: 20px; } -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_text textarea, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email input, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url input, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_float input, -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_selection select, -.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root, -.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master { +.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one input, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_char input, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_text textarea, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_email, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_email input, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_url, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_url input, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_float input, +.openerp .oe_form .oe_form_group_cell > .oe_form_field_selection select, +.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root, +.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master { width: 100%; } -.openerp .oe_form_autolayout .oe_form_button.oe_button { - color: #4c4c4c; -} -.openerp .oe_form_autolayout .oe_form_button.oe_button span { - position: relative; - vertical-align: top; -} -.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_button.oe_button { - white-space: nowrap; - min-width: 100%; - width: 100%; -} -.openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested { +.openerp .oe_form .oe_form_group_cell.oe_form_group_nested { padding: 0; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { @@ -1699,10 +1684,23 @@ right: 5px; top: 3px; } +.openerp .oe_form .oe_form_button.oe_button { + height: 22px; + color: #4c4c4c; +} +.openerp .oe_form .oe_form_button.oe_button span { + position: relative; + vertical-align: top; +} .openerp .oe_form .oe_form_button > img { vertical-align: -3px; padding: 0 2px; } +.openerp .oe_form .oe_form_group_cell > .oe_form_button.oe_button { + white-space: nowrap; + min-width: 100%; + width: 100%; +} .openerp .oe_form .oe-binary-file-set { overflow: hidden; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 411e345bc9f..594691f1de9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1154,7 +1154,7 @@ $colour4: #8a89ba line-height: 30px button font-size: 12px - height: 24px + height: 24px !important line-height: 24px vertical-align: top padding: 0 10px @@ -1231,10 +1231,8 @@ $colour4: #8a89ba border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) // }}} - // FormView.autolayout {{{ - .oe_form_autolayout - .oe_button - height: 20px + // FormView.layout {{{ + .oe_form .oe_form_group_cell line-height: 18px padding: 2px @@ -1252,15 +1250,6 @@ $colour4: #8a89ba .oe_form_group_cell > div > .oe_datepicker_root, .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master width: 100% - .oe_form_button.oe_button - color: #4c4c4c - span - position: relative - vertical-align: top - .oe_form_group_cell > .oe_form_button.oe_button - white-space: nowrap - min-width: 100% - width: 100% .oe_form_group_cell.oe_form_group_nested padding: 0 // }}} @@ -1376,9 +1365,6 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important - // }}} - // FormView.buttons {{{ - .oe_form .oe_button.oe_field_button -webkit-border-top-left-radius: 0px -webkit-border-bottom-left-radius: 0px @@ -1399,9 +1385,22 @@ $colour4: #8a89ba filter: alpha(opacity=50) right: 5px top: 3px + // }}} + // FormView.buttons {{{ + .oe_form + .oe_form_button.oe_button + height: 22px + color: #4c4c4c + span + position: relative + vertical-align: top .oe_form_button > img vertical-align: -3px padding: 0 2px + .oe_form_group_cell > .oe_form_button.oe_button + white-space: nowrap + min-width: 100% + width: 100% // }}} // FormView.binaryfile {{{ /* http://www.quirksmode.org/dom/inputfile.html diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b0cf4df6b78..3779b8c49bb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -984,9 +984,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt }, process: function($tag, layout) { var self = this; - if ($tag.attr('layout') === 'auto') { - $tag.addClass('oe_form_autolayout'); - } layout = $tag.attr('layout') || layout || 'auto'; $tag.removeAttr('layout'); var tagname = $tag[0].nodeName.toLowerCase(); From 5f8a3c7fa4f66cc8234bac5579f901618705f66b Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 15:18:04 +0200 Subject: [PATCH 5/5] [FIX] Fixed buttons padding bzr revid: fme@openerp.com-20120516131804-ui3iok3qsyprqy0h --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2c763be0643..5ed7e2dbd8e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1662,6 +1662,7 @@ border: 1px solid #dd0000 !important; } .openerp .oe_form .oe_button.oe_field_button { + display: block; -webkit-border-top-left-radius: 0px; -webkit-border-bottom-left-radius: 0px; -moz-border-radius-topleft: 0px; @@ -1697,6 +1698,7 @@ padding: 0 2px; } .openerp .oe_form .oe_form_group_cell > .oe_form_button.oe_button { + display: block; white-space: nowrap; min-width: 100%; width: 100%; @@ -1844,7 +1846,7 @@ } .openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell, .openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell { - padding: 2px 2px 2px 8px !important; + padding-left: 8px; } .openerp .oe-listview-content { width: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 594691f1de9..6073cfbce00 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1366,6 +1366,7 @@ $colour4: #8a89ba background-color: #F66 !important border: 1px solid #D00 !important .oe_button.oe_field_button + display: block -webkit-border-top-left-radius: 0px -webkit-border-bottom-left-radius: 0px -moz-border-radius-topleft: 0px @@ -1398,6 +1399,7 @@ $colour4: #8a89ba vertical-align: -3px padding: 0 2px .oe_form_group_cell > .oe_form_button.oe_button + display: block white-space: nowrap min-width: 100% width: 100% @@ -1538,7 +1540,7 @@ $colour4: #8a89ba min-width: 120px .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell, .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell - padding: 2px 2px 2px 8px !important + padding-left: 8px // }}} // ListView {{{ .oe-listview-content