From 2c8d0d9a3f4e63586af619e1c2e57cafeb6591b5 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 11:46:09 +0100 Subject: [PATCH 01/23] Some changes in list and form font sizes bzr revid: ahu@openerp.com-20111122104609-m9kdnqptdo30faoe --- addons/web/static/src/css/base.css | 70 +++++++++++++++++++++-- addons/web/static/src/css/data_import.css | 2 +- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d8f31af1d35..1d93249fba3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -10,6 +10,7 @@ body.openerp { body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { font-family: Ubuntu, Helvetica, sans-serif; + font-size:85%; } .oe_box { @@ -29,6 +30,17 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio .openerp .oe-listview .oe-number { text-align: right !important; } +.oe-listview-header-columns { + background: #ccc; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #ebe9e9 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ebe9e9)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EBE9E9',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ +} + .openerp .oe_hide { display: none !important; } @@ -530,7 +542,7 @@ label.error { } .openerp h2.oe_view_title { - font-size: 175%; + font-size: 110%; font-weight: normal; margin: 2px 0; color: #252424; @@ -631,6 +643,10 @@ label.error { .openerp .searchview_group_content { padding-left: 10px; } +.openerp .searchview_group_content .oe_label, .openerp .searchview_group_content .oe_label_help { + font-weight:bold; + color:#4c4c4c; +} .openerp .searchview_extended_group { padding: 3px; @@ -738,15 +754,28 @@ label.error { } .openerp .oe-listview th.oe-sortable { cursor: pointer; + font-size:80%; + text-transform:uppercase; + padding:0px; + margin:0px; + padding-left:3px; + color:#333; } .openerp .oe-listview th.oe-sortable .ui-icon { - height: 1em; - display: inline; + height: 60%; + margin: -6px 0px 0px 0px; display: inline-block; + vertical-align:middle; } .openerp .oe-listview .oe-field-cell { cursor: pointer; + font-size:90% + margin-top: 0px; + margin-bottom: 0px; + padding-top: 0px; + padding-bottom: 0px; + font-size:80%; } .openerp .oe-listview .oe-field-cell progress { width: 100%; @@ -778,6 +807,7 @@ label.error { } .openerp .oe-list-pager .oe-pager-state { cursor: pointer; + font-size:90%; } .openerp .oe-listview .oe-group-name { @@ -794,6 +824,8 @@ label.error { .openerp .oe-listview .oe-list-footer { text-align: center; white-space: nowrap; + color:#444; + font-size:85%; } .openerp .oe-listview .oe-list-footer span { margin: 0 1em; @@ -854,7 +886,9 @@ label.error { border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; - line-height: 0.5em; + line-height: 0.8em; + font-size:0.85em; + color:#555; } .openerp .oe_form_notebook ul.ui-tabs-nav li { font-weight: bold; @@ -868,6 +902,13 @@ label.error { } /* Form */ +.openerp table.oe_frame td { + color: #4c4c4c; +} +.openerp td.oe_form_frame_cell { + padding: 2px; + position: relative; +} .openerp .oe_frame.oe_forms { clear: both; } @@ -900,10 +941,14 @@ label.error { } .openerp .oe_form_pager, .openerp .oe_list_pager { float: right; + font-size:80%; + color:gray; + font-weight:bold; } .openerp label.oe_label_help, .openerp label.oe_label { display: block; + font-size:85%; } .openerp label.oe_label_help { cursor: help; @@ -1055,10 +1100,14 @@ label.error { border: 0 solid #666; } .openerp .separator.horizontal { - font-weight: bold; + font-weight: bold; border-bottom-width: 1px; margin: 3px 4px 3px 1px; height: 15px; + font-size:90%; +} +.openerp .separator.horizontal:empty { + height: 5px; } .openerp .oe_form_frame_cell.oe_form_separator_vertical { border-left: 1px solid #666; @@ -1095,6 +1144,17 @@ label.error { background: white; min-width: 90px; } +.openerp tbody.ui-widget-content { + margin-bottom:10px; + border-spacing:4px; + /*border:1px solid red; + background-color:red; + color:red;*/ +} +.openerp .ui-widget-header { + background-image:none; + background-color:white; +} /* Sidebar */ .openerp .view-manager-main-table { diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css index e5d1c9a910c..a63a52802f0 100644 --- a/addons/web/static/src/css/data_import.css +++ b/addons/web/static/src/css/data_import.css @@ -27,7 +27,7 @@ .openerp .oe-import fieldset.oe-closed table { display: none; } -.openerp .separator.horizontal { +.openerp .oe-import .separator.horizontal { font-weight: bold; border-bottom-width: 1px; margin: 6px 4px 6px 1px; From f661ad310e0536522e80982ad1a206f3e28c34f5 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 13:04:59 +0100 Subject: [PATCH 02/23] [NEW] Font form sizes and separator changes bzr revid: ahu@openerp.com-20111122120459-54ljeteh1im0pm03 --- addons/web/static/src/css/base.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1d93249fba3..495f751ac0b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -754,7 +754,7 @@ label.error { } .openerp .oe-listview th.oe-sortable { cursor: pointer; - font-size:80%; + font-size:75%; text-transform:uppercase; padding:0px; margin:0px; @@ -768,6 +768,7 @@ label.error { vertical-align:middle; } + .openerp .oe-listview .oe-field-cell { cursor: pointer; font-size:90% @@ -948,11 +949,17 @@ label.error { .openerp label.oe_label_help, .openerp label.oe_label { display: block; - font-size:85%; + color:#4c4c4c; + font-size:80%; + font-weight:700; +/* letter-spacing:1px;*/ } .openerp label.oe_label_help { cursor: help; } +.openerp .oe_form_frame_cell .oe_label, .openerp .oe_form_frame_cell .oe_label_help { + font-weight:500; +} .openerp #tiptip_content { font-size: 12px; } From d83aab5595442bac6319b9861060e71f3abc8395 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 14:05:37 +0100 Subject: [PATCH 03/23] [IMP] Font size and padding for the list view. Removing & changing deletion icon. Changing Search icons bzr revid: ahu@openerp.com-20111122130537-0egbg0bffgrpd99g --- addons/web/static/src/css/base.css | 62 ++++++++++++++++++++---------- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 495f751ac0b..dfd92da0916 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,3 @@ -/* TODO: separate openerp web client page css from openerp views css */ body.openerp { padding: 0; margin: 0; @@ -31,14 +30,14 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio text-align: right !important; } .oe-listview-header-columns { - background: #ccc; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #ebe9e9 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ebe9e9)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EBE9E9',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ + background: #444; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #d1d1d1 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#d1d1d1)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#d1d1d1',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* W3C */ } .openerp .oe_hide { @@ -556,9 +555,9 @@ label.error { /* SearchView */ .openerp .filter_label, .openerp .filter_icon { - border: 1px solid #666; border-left-width: 0; background: #F0F0F0; + border: 1px solid #999; background: -moz-linear-gradient(top, #F0F0F0 0%, #C0C0C0 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F0F0F0), color-stop(100%,#C0C0C0)); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F0F0F0', endColorstr='#C0C0C0',GradientType=0 ); @@ -570,13 +569,13 @@ label.error { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F0F0F0', endColorstr='#A1A7CE',GradientType=0 ); } .openerp .filter_label:active, .openerp .filter_icon:active { - background: #AAAAAA; + background: #aaa; background: -moz-linear-gradient(top, #999999 0%, #EEEEEE 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#999999), color-stop(100%,#EEEEEE)); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#999999', endColorstr='#EEEEEE',GradientType=0 ); } .openerp .filter_label.enabled, .openerp .filter_icon.enabled { - background: #AAAAAA; + background: #aaa; } .openerp .filter_icon { height: 22px; @@ -600,13 +599,17 @@ label.error { white-space: nowrap; } .openerp .filter_label_group button:first-child { - border-left: 1px solid #666; -webkit-border-top-left-radius: 7px; -webkit-border-bottom-left-radius: 7px; -moz-border-radius-topleft: 7px; -moz-border-radius-bottomleft: 7px; border-top-left-radius: 7px; border-bottom-left-radius: 7px; + /*border-left:0px;*/ + border-right:none; +} +.openerp .filter_label_group button { + border-right:none; } .openerp .filter_label_group button:last-child { -webkit-border-top-right-radius: 7px; @@ -615,6 +618,20 @@ label.error { -moz-border-radius-bottomright: 7px; border-top-right-radius: 7px; border-bottom-right-radius: 7px; + border-right:1px solid #999; +} +.openerp .filter_label_group button.filter_icon img { + padding:1px 8px 0px 8px; +} +.openerp .filter_label_group button.filter_icon:first-child { + border-left:solid 1px #999; + margin-left:-7px; + -webkit-border-top-left-radius: 0px; + -webkit-border-bottom-left-radius: 0px; + -moz-border-radius-topleft: 0px; + -moz-border-radius-bottomleft: 0px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; } .openerp .searchview_group_string { @@ -731,10 +748,16 @@ label.error { text-align: left; padding: 1px 2px; } -.openerp .oe-listview th.oe-record-selector, -.openerp .oe-listview td.oe-button, -.openerp .oe-listview td.oe-record-delete { - padding: 0 1px; + +.openerp .oe-record-delete button{ + border:none; + height:12px; + width:12px; + background-image:url("/web/static/src/img/iconset-b-remove.gif"); + background-repeat:no-repeat; + background-position:center center; + background-color:transparent; + cursor:pointer; } /* Could use :not selectors if they were supported by MSIE8... */ @@ -771,11 +794,10 @@ label.error { .openerp .oe-listview .oe-field-cell { cursor: pointer; - font-size:90% margin-top: 0px; margin-bottom: 0px; - padding-top: 0px; - padding-bottom: 0px; + padding-top: 3px; + padding-bottom: 3px; font-size:80%; } .openerp .oe-listview .oe-field-cell progress { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fb7ccdf7d8e..4fe179fb70f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -647,7 +647,7 @@ - + From f97682aac2c1640d3855e1db33232082713291b0 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 15:08:59 +0100 Subject: [PATCH 04/23] [IMP] fonts bzr revid: ahu@openerp.com-20111122140859-z0vff9cyfod0ykoa --- addons/web/static/src/css/base.css | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dfd92da0916..72788351576 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -5,6 +5,7 @@ body.openerp { min-width: 1000px; overflow-y: scroll; font-size: 80%; + font-family: Ubuntu, Helvetica, sans-serif; } body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { @@ -272,7 +273,7 @@ label.error { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#BD5E54', endColorstr='#90322A',GradientType=0 ); /* IE6-9 */ background: linear-gradient(top, #bd5e54 0%,#90322a 60%); /* W3C */ - border: 1px solid #6E2A24; + border: 1px solid #5E1A14; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -283,7 +284,7 @@ label.error { text-transform: uppercase; line-height: 20px; font-weight: bold; - font-size: 85%; + font-size: 75%; white-space: nowrap; } @@ -442,6 +443,8 @@ label.error { margin: 0; padding: 4px 10px; text-shadow: 0 1px 0 #111111; + font-weight:600; + line-height:14px; } .openerp .header_title small { color: #ccc; @@ -509,6 +512,10 @@ label.error { font-weight: bold; } +.openerp .logout { + font-size:80%; +} + /* Footer */ .openerp div.oe_footer { background: none repeat scroll 0 0 #CCCCCC; @@ -552,6 +559,9 @@ label.error { .openerp .oe_vm_switch { float: right; } +.openerp .oe-view-manager-header .oe_view_title { + font-size:150%; +} /* SearchView */ .openerp .filter_label, .openerp .filter_icon { @@ -831,6 +841,7 @@ label.error { .openerp .oe-list-pager .oe-pager-state { cursor: pointer; font-size:90%; + color:#555; } .openerp .oe-listview .oe-group-name { @@ -925,6 +936,10 @@ label.error { } /* Form */ +.openerp .oe_form_frame_cell input[type="checkbox"] { + margin-top:5px; + vertical-align:center; +} .openerp table.oe_frame td { color: #4c4c4c; } @@ -1000,7 +1015,7 @@ label.error { } .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help { - margin: 3px 0 0 10px; + margin: 3px 0 0 3px; } .openerp label.oe_label_help span { font-size: 80%; @@ -1199,6 +1214,7 @@ label.error { .openerp .view-manager-main-content { width: 100%; + padding:0px 7px; } .openerp .oe-view-manager-header { overflow: auto; @@ -1515,6 +1531,7 @@ label.error { .oe-shortcut-toggle { height: 20px; padding: 0; + margin-top:4px; width: 24px; cursor: pointer; display: block; From b3366f526e042936cb24a756987b089e3a558ea9 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 15:50:11 +0100 Subject: [PATCH 05/23] [IMP] kanban view font size bzr revid: ahu@openerp.com-20111122145011-1x3siw26qrwc8j51 --- addons/web_kanban/static/src/css/kanban.css | 23 +++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 86818f6541c..57fedecfbad 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,3 +1,4 @@ + .openerp .oe_kanban_view .ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; @@ -18,9 +19,10 @@ } .openerp .oe_kanban_group_title { - color: #000000; - font-size: 130%; + font-size: 100%; font-weight: bold; + padding-left:2px; + color: #666666; } .openerp .oe_kanban_group_title_undefined { color: #666666; @@ -45,10 +47,10 @@ .openerp .oe_kanban_fold_icon { cursor: pointer; float: left; - padding: 2px 2px 0 0; + padding: 4px 2px 0 2px; width: 16px; height: 16px; - background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat; + background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat center center; } .openerp .oe_kanban_group_folded .oe_kanban_fold_icon { background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat; @@ -64,6 +66,7 @@ } .openerp ul.oe_kanban_aggregates span { text-decoration: underline; + font-size:90%; } .openerp .oe_kanban_action_button { @@ -90,12 +93,13 @@ padding: 0 4px 0 4px; } .openerp .oe_kanban_title2 { - font-size: 110%; + font-size: 100%; font-weight: bold; + color:#3A3A3A; padding: 0 4px 0 4px; } .openerp .oe_kanban_title3 { - font-size: 100%; + font-size: 95%; font-weight: normal; padding: 0 4px 0 4px; } @@ -105,6 +109,7 @@ } .openerp .oe_kanban_table { width: 100%; + font-size:95%; border: none; border-collapse: collapse; margin: 0; @@ -116,7 +121,13 @@ } .openerp .oe_kanban_box_content { padding: 4px; + font-size:90%; } +.openerp .oe_kanban_box_content div:last-child { + padding-top:4px; + color:#555; +} + .openerp .oe_kanban_buttons_set { border-top: 1px dotted; white-space: nowrap; From ea92099e3df707677b7bf8721e872b834bbea2af Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 22 Nov 2011 17:14:37 +0100 Subject: [PATCH 06/23] [IMP] non-editable view changes bzr revid: ahu@openerp.com-20111122161437-3d8q3v27uofvpii4 --- addons/web/static/src/css/base.css | 13 +++++++++++++ addons/web_kanban/static/src/css/kanban.css | 3 +++ 2 files changed, 16 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 72788351576..3b9071bec23 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -934,6 +934,19 @@ label.error { .openerp .oe_form_notebook .ui-tabs-selected { background: #f9f9f9; } +/* Unedit Form */ +.openerp .field_char, .openerp .field_date, .openerp .field_float, .openerp .field_selection, .openerp .oe_form_field_many2one a { + vertical-align:middle; + padding-top:3px; + font-size:90%; + color:#222; +} +.openerp .oe_form_field_many2one a { + color:#9A0404; + line-height:12px; +} + + /* Form */ .openerp .oe_form_frame_cell input[type="checkbox"] { diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 57fedecfbad..bc68c8068a0 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -102,6 +102,9 @@ font-size: 95%; font-weight: normal; padding: 0 4px 0 4px; + line-height:16px; +} +.openerp .oe_kanban_title3 img{ } .openerp .oe_kanban_small { font-size: 80%; From e297c801a4ceb2ac40c21490719b517a8a38d489 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 24 Nov 2011 11:12:57 +0100 Subject: [PATCH 07/23] [ADD] adding file iconset-b-remove.png & taking other comments into account bzr revid: ahu@openerp.com-20111124101257-2n3dotrm6fhya2tu --- addons/web/static/src/css/base.css | 48 ++++++++++-------- .../web/static/src/img/iconset-b-remove.png | Bin 0 -> 189 bytes 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 addons/web/static/src/img/iconset-b-remove.png diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 287aeca5224..27dd7e8fcf5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -443,7 +443,7 @@ label.error { margin: 0; padding: 4px 10px; text-shadow: 0 1px 0 #111111; - font-weight:600; + font-weight:normal; line-height:14px; } .openerp .header_title small { @@ -478,15 +478,11 @@ label.error { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#929292', endColorstr='#4D4D4D',GradientType=0 ); } .openerp .header_corner ul.block { - /*float: left;*/ list-style: none; height: 34px; margin: 0; padding: 0 0 0 2px; - /*background: url(../images/top-sep-a.png) no-repeat;*/ line-height: 33px; - /*font-size: 1em;*/ - /*text-transform: uppercase;*/ } .openerp .header_corner ul.block li { float: left; @@ -670,6 +666,8 @@ label.error { .openerp .searchview_group_content { padding-left: 10px; } + + .openerp .searchview_group_content .oe_label, .openerp .searchview_group_content .oe_label_help { font-weight:bold; color:#4c4c4c; @@ -763,16 +761,13 @@ label.error { border:none; height:12px; width:12px; - background-image:url("/web/static/src/img/iconset-b-remove.gif"); - background-repeat:no-repeat; - background-position:center center; - background-color:transparent; + background: url("/web/static/src/img/iconset-b-remove.png") no-repeat scroll center center transparent; cursor:pointer; } /* Could use :not selectors if they were supported by MSIE8... */ .openerp .oe-listview tbody td { - border-left: 1px solid #dadada; + /*border-left: 1px solid #dadada; currently commenting to test with no vertical lines in list view*/ } .openerp .oe-listview tbody td:first-child, .openerp .oe-listview tbody td.oe-button, @@ -797,10 +792,14 @@ label.error { .openerp .oe-listview th.oe-sortable .ui-icon { height: 60%; margin: -6px 0px 0px 0px; + display: inline; display: inline-block; vertical-align:middle; } +.openerp .oe-record-selector, .openerp .oe-field-cell, .openerp .oe-record-delete { + border-bottom:1px solid #E3E3E3; +} .openerp .oe-listview .oe-field-cell { cursor: pointer; @@ -953,6 +952,10 @@ label.error { margin-top:5px; vertical-align:center; } +.openerp .oe_form_frame_cell .input[type="text"] { + padding-bottom:1px; +} + .openerp table.oe_frame td { color: #4c4c4c; } @@ -997,18 +1000,21 @@ label.error { font-weight:bold; } + +.openerp label.oe_label_help, .openerp label.oe_label, .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button, .openerp .oe_forms textarea { + font-size:85%; +} + .openerp label.oe_label_help, .openerp label.oe_label { display: block; color:#4c4c4c; - font-size:80%; - font-weight:700; -/* letter-spacing:1px;*/ + font-weight:normal; } .openerp label.oe_label_help { cursor: help; } .openerp .oe_form_frame_cell .oe_label, .openerp .oe_form_frame_cell .oe_label_help { - font-weight:500; + font-weight:normal; } .openerp #tiptip_content { font-size: 12px; @@ -1057,7 +1063,7 @@ label.error { -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - padding: 0 2px 0 2px; + padding: 0px 2px 1px 2px; border: 1px solid #999; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1204,9 +1210,6 @@ label.error { .openerp tbody.ui-widget-content { margin-bottom:10px; border-spacing:4px; - /*border:1px solid red; - background-color:red; - color:red;*/ } .openerp .ui-widget-header { background-image:none; @@ -1227,7 +1230,7 @@ label.error { .openerp .view-manager-main-content { width: 100%; - padding:0px 7px; + padding:0px; } .openerp .oe-view-manager-header { overflow: auto; @@ -1565,7 +1568,6 @@ label.error { /* ================ */ .oe-shortcuts { position: absolute; - margin: 0; padding: 6px 15px; top: 37px; @@ -1591,9 +1593,13 @@ label.error { text-align: center; border-left: 1px solid #909090; padding: 4px; - font-size: 90%; + font-size: 80%; font-weight: normal; } + +.oe-shortcuts li:hover { + background-color:#666; +} .oe-shortcuts li:first-child { border-left: none; padding-left: 0; diff --git a/addons/web/static/src/img/iconset-b-remove.png b/addons/web/static/src/img/iconset-b-remove.png new file mode 100644 index 0000000000000000000000000000000000000000..497f03b4cebaa7a0aab8d91369d4e9bd495b7a63 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=(3?#Lsx0C=W#^NA%Cx&(BWL|<~0(?STQ+3my zK7IQ3?b}_uc5V8X^c|$AB*-tA!Qt7BG!Q4r+uensgH_f8$l)yTh%9Dc;1&j9Muu5) zB!GhKC7!;n?6Co#|tjkchW7FnE*9kSrjr(#FEj Xb%XV8`sJ6VK!psRu6{1-oD!M Date: Thu, 24 Nov 2011 13:41:41 +0100 Subject: [PATCH 08/23] [IMP] font size improvements for the view form + changes in view list element borders bzr revid: ahu@openerp.com-20111124124141-3ggevbublytob5eh --- addons/web/static/src/css/base.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 27dd7e8fcf5..af7ba2eea85 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -767,7 +767,7 @@ label.error { /* Could use :not selectors if they were supported by MSIE8... */ .openerp .oe-listview tbody td { - /*border-left: 1px solid #dadada; currently commenting to test with no vertical lines in list view*/ + border-left: 1px solid #dadada; /*currently commenting to test with no vertical lines in list view*/ } .openerp .oe-listview tbody td:first-child, .openerp .oe-listview tbody td.oe-button, @@ -800,6 +800,9 @@ label.error { .openerp .oe-record-selector, .openerp .oe-field-cell, .openerp .oe-record-delete { border-bottom:1px solid #E3E3E3; } +.openerp .oe-record-selector:empty, .openerp .oe-record-delete button[style="visibility: hidden"] { + border-bottom:none; +} .openerp .oe-listview .oe-field-cell { cursor: pointer; @@ -1034,7 +1037,7 @@ label.error { } .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help { - margin: 3px 0 0 3px; + margin: 4px 0 0 3px; } .openerp label.oe_label_help span { font-size: 80%; @@ -1087,6 +1090,9 @@ label.error { min-width: 100%; width: 100%; } +.openerp .oe_forms .button { + height:22px; +} @-moz-document url-prefix() { /* Strange firefox behaviour on width: 100% + white-space: nowrap */ .openerp .oe_forms .oe_button { From 637398a538fa596882b080fe0d7034204ee07c92 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 24 Nov 2011 14:02:53 +0100 Subject: [PATCH 09/23] [ADD] adding a new css class 'oe_form_readonly' to the uneditable form to ease css selection and changes bzr revid: ahu@openerp.com-20111124130253-zcmgizy9vmhk90yb --- addons/web/static/src/js/view_form.js | 4 ++++ addons/web/static/src/xml/base.xml | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ced99bea7c2..8207e7df2b2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3060,6 +3060,9 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({ openerp.web.form.FieldReadonly = openerp.web.form.Field.extend({ +}); +openerp.web.form.WidgetFrameReadonly = openerp.web.form.WidgetFrame.extend({ + template: 'WidgetFrame.readonly' }); openerp.web.form.FieldCharReadonly = openerp.web.form.FieldReadonly.extend({ template: 'FieldChar.readonly', @@ -3213,6 +3216,7 @@ openerp.web.form.FieldOne2ManyReadonly = openerp.web.form.FieldOne2Many.extend({ force_readonly: true }); openerp.web.form.readonly = openerp.web.form.widgets.clone({ + 'frame': 'openerp.web.form.WidgetFrameReadonly', 'char': 'openerp.web.form.FieldCharReadonly', 'email': 'openerp.web.form.FieldEmailReadonly', 'url': 'openerp.web.form.FieldUrlReadonly', diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 466e3c9c5c9..2361d187d51 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -727,6 +727,11 @@ + + + this.attr('class', this.attr('class')+' oe_form_readonly'); + +
@@ -1710,4 +1715,4 @@
- \ No newline at end of file + From a729d91fda40d2f954f7272061a2a92f239f94d8 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 24 Nov 2011 16:07:08 +0100 Subject: [PATCH 10/23] [IMP] changes in m2o sizes bzr revid: ahu@openerp.com-20111124150708-qmte30hl4940n0aj --- addons/web/static/src/css/base.css | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index af7ba2eea85..2f6b2529e2d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -937,7 +937,7 @@ label.error { background: #f9f9f9; } /* Unedit Form */ -.openerp .field_char, .openerp .field_date, .openerp .field_float, .openerp .field_selection, .openerp .oe_form_field_many2one a { +.openerp .field_char, .openerp .field_date, .openerp .field_float, .openerp .oe_form_field_many2one a { vertical-align:middle; padding-top:3px; font-size:90%; @@ -1060,6 +1060,16 @@ label.error { margin: 3px 0 0 0; } +/* Uneditable Form View */ +.openerp .oe_form_readonly .field_char, .openerp .oe_form_readonly .oe_form_field_email { + padding-top:4px; +} + +.openerp .oe_form_readonly .field_selection { + padding-top:2px; +} + + /* Inputs */ .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea { -moz-box-sizing: border-box; @@ -1075,6 +1085,10 @@ label.error { min-width: 90px; color: #1f1f1f; } +.openerp .oe_forms select{ + padding-top: 2px; +} + .openerp .oe_forms textarea { resize:vertical; } @@ -1500,6 +1514,7 @@ label.error { } .openerp .oe_forms .oe-m2o input[type="text"] { padding-right: 20px; + padding-top: 2px; } .openerp .oe-m2o-drop-down-button { margin-left: -23px; @@ -1515,6 +1530,9 @@ label.error { .openerp .oe-m2o-disabled-cm { color: grey; } +.openerp ul[role="listbox"] li a { + font-size:80%; +} .parent_top { vertical-align: text-top; } From 77174f444b9e4aec80b4ad134a722dc6c779763d Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 24 Nov 2011 16:45:11 +0100 Subject: [PATCH 11/23] [IMP] removing +td element at end of line 774 & 775 to retrieve left border on some list columns bzr revid: ahu@openerp.com-20111124154511-9jko18g9rkgosn0b --- addons/web/static/src/css/base.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2f6b2529e2d..3ee1d3d0d81 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -771,8 +771,8 @@ label.error { } .openerp .oe-listview tbody td:first-child, .openerp .oe-listview tbody td.oe-button, -.openerp .oe-listview tbody td.oe-button+td, -.openerp .oe-listview tbody th.oe-record-selector+td, +.openerp .oe-listview tbody td.oe-button, +.openerp .oe-listview tbody th.oe-record-selector, .openerp .oe-listview tbody td.oe-record-delete { border-left: none; } @@ -797,11 +797,18 @@ label.error { vertical-align:middle; } -.openerp .oe-record-selector, .openerp .oe-field-cell, .openerp .oe-record-delete { +/*.openerp .oe-record-selector, .openerp .oe-field-cell, .openerp .oe-record-delete { border-bottom:1px solid #E3E3E3; } .openerp .oe-record-selector:empty, .openerp .oe-record-delete button[style="visibility: hidden"] { border-bottom:none; +} */ +.openerp .oe-listview table tbody td { + border-bottom:1px solid #E3E3E3; +} + +.openerp .oe-listview .oe-record-selector { + border-bottom:1px solid #E3E3E3; } .openerp .oe-listview .oe-field-cell { From 45cf233361ff6c064e140475167377f6a2b778ca Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 24 Nov 2011 17:49:13 +0100 Subject: [PATCH 12/23] [IMP] changes in secondary level menu -> more indentation. Changes in padding for the main container at the beginning of the base.css file bzr revid: ahu@openerp.com-20111124164913-scmuwghvcxidkf56 --- addons/web/static/src/css/base.css | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3ee1d3d0d81..7eea0c8d73a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -13,6 +13,20 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio font-size:85%; } +.openerp .view-manager-main-content>div{ + padding:0px 8px; +} +.openerp .view-manager-main-content>div.oe-view-manager-header { + padding:0px; +} +.openerp .view-manager-main-content>div.oe-view-manager-header > a, .openerp .view-manager-main-content>div.oe-view-manager-header > div { + padding:0px 8px; +} + +.openerp .oe-dashboard-action .view-manager-main-content > div { + padding:0px 0px; +} + .oe_box { border: 1px solid #aaf; padding: 2px; @@ -383,6 +397,10 @@ label.error { white-space: nowrap; color: white; text-shadow: 0 1px 0 #333; + +} +.openerp a.oe_secondary_submenu_item { + padding: 0 5px 2px 10px; } .openerp a.oe_secondary_submenu_item:hover, .openerp a.oe_secondary_submenu_item.leaf.active { @@ -395,7 +413,7 @@ label.error { background: -ms-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* IE10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#5A5858',GradientType=0 ); /* IE6-9 */ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* W3C */ - padding: 0 5px 2px 5px; + padding: 0 5px 2px 10px; line-height: 20px; color: #3f3d3d; text-decoration: none; @@ -408,6 +426,7 @@ label.error { content: "\25b8"; } + /* Header */ .openerp .header { height: 65px; @@ -673,6 +692,11 @@ label.error { color:#4c4c4c; } +.openerp .oe-searchview-render-line .oe_label, .openerp .oe-searchview-render-line .oe_label_help { + font-weight:bold; + font-size:80%; +} + .openerp .searchview_extended_group { padding: 3px; margin: 2px; From 4d5b8b0b9d74ca267c15f4e47f0c064ca1783185 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Fri, 25 Nov 2011 11:16:07 +0100 Subject: [PATCH 13/23] [IMP] Improving vertical centering of oe-shortcuts li & modifying some input margin & padding so that the look is the same under firefox & chrome bzr revid: ahu@openerp.com-20111125101607-6rw4yn81bmqc736e --- addons/web/static/src/css/base.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7eea0c8d73a..c210c7db879 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -682,9 +682,9 @@ label.error { .openerp .searchview_group.expanded .searchview_group_content { display: block; } -.openerp .searchview_group_content { +/*.openerp .searchview_group_content { padding-left: 10px; -} +} */ .openerp .searchview_group_content .oe_label, .openerp .searchview_group_content .oe_label_help { @@ -1107,7 +1107,8 @@ label.error { -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - padding: 0px 2px 1px 2px; + padding: 0px 2px; + margin: 0px 2px 0px 2px; border: 1px solid #999; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1647,9 +1648,10 @@ label.error { color: #fff; text-align: center; border-left: 1px solid #909090; - padding: 4px; + padding: 0px 4px 0px 4px; font-size: 80%; font-weight: normal; + vertical-align: top; } .oe-shortcuts li:hover { From 959cf42d70f6e44aafa1bb631b4fbccf48628a00 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Fri, 25 Nov 2011 11:38:54 +0100 Subject: [PATCH 14/23] [IMP] changes in label margin in searchview bzr revid: ahu@openerp.com-20111125103854-c2e023ai61zyvcpe --- addons/web/static/src/css/base.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c210c7db879..69c7a9c74d7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -23,6 +23,10 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio padding:0px 8px; } +.openerp .view-manager-main-content > div.oe-view-manager-header > a[style] + h2.oe_view_title{ /* Padding only for the view form title*/ + padding-left:10px; +} + .openerp .oe-dashboard-action .view-manager-main-content > div { padding:0px 0px; } @@ -1070,6 +1074,10 @@ label.error { .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help { margin: 4px 0 0 3px; } +.openerp .oe_forms .searchview_group_content label.oe_label, .openerp .searchview_group_content .oe_forms label.oe_label_help { /* making a distinction between labels in search view and other labels */ + margin: 3px 0 0 3px; +} + .openerp label.oe_label_help span { font-size: 80%; color: darkgreen; From e0f3d38123dc034c875ec384e6295bfd3e396a02 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Fri, 25 Nov 2011 11:54:35 +0100 Subject: [PATCH 15/23] [IMP] changes in oe form pager: margin bzr revid: ahu@openerp.com-20111125105435-f6uvdzqa9997e7em --- addons/web/static/src/css/base.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 69c7a9c74d7..c000a9d8ca3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1038,6 +1038,10 @@ label.error { font-weight:bold; } +.openerp .oe_form_pager { + margin-right:3px; +} + .openerp label.oe_label_help, .openerp label.oe_label, .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button, .openerp .oe_forms textarea { font-size:85%; From e1769146455e3662af5db8ff4514496ca285ddac Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Fri, 25 Nov 2011 13:22:12 +0100 Subject: [PATCH 16/23] [IMP] modifying nested list padding bzr revid: ahu@openerp.com-20111125122212-j7vcua3y62kch7r2 --- addons/web/static/src/css/base.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c000a9d8ca3..1855f488632 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -27,6 +27,12 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio padding-left:10px; } +.openerp .view-manager-main-content .view-manager-main-content > div { /* No padding for other nested childs */ + padding-left:0px; + padding-right:0px; +} + + .openerp .oe-dashboard-action .view-manager-main-content > div { padding:0px 0px; } @@ -958,7 +964,7 @@ label.error { -moz-border-radius: 0; -webkit-border-radius: 0; line-height: 0.8em; - font-size:0.85em; + font-size:95%; color:#555; } .openerp .oe_form_notebook ul.ui-tabs-nav li { @@ -1230,8 +1236,8 @@ label.error { font-weight: bold; border-bottom-width: 1px; margin: 3px 4px 3px 1px; - height: 15px; - font-size:90%; + height: 17px; + font-size:95%; } .openerp .separator.horizontal:empty { height: 5px; From 6ba216d9a2126ecf288f1ae894c2b78ba4066b37 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Fri, 25 Nov 2011 13:30:08 +0100 Subject: [PATCH 17/23] [IMP] rounding ui-tabs-panel bzr revid: ahu@openerp.com-20111125123008-i31at003ldejl24s --- addons/web/static/src/css/base.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1855f488632..4bd920eb3ab 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -955,11 +955,14 @@ label.error { } .openerp .oe_form_notebook .ui-tabs-panel { padding: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; } .openerp .oe_form_notebook ul.ui-tabs-nav { padding-left: 0; background: transparent; - border-width: 0 0 1px 0; + border-width: 0 0 0px 0; border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; @@ -972,7 +975,7 @@ label.error { } .openerp .oe_form_notebook .ui-tabs-panel { background: #f9f9f9; - border-width: 0 1px 1px 1px; + border-width: 1px 1px 1px 1px; } .openerp .oe_form_notebook .ui-tabs-selected { background: #f9f9f9; From da84ac388d5ee0dc949252eff1080edbcd30e196 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Tue, 29 Nov 2011 15:43:05 +0100 Subject: [PATCH 18/23] ci before merge bzr revid: ahu@openerp.com-20111129144305-98tbd9ur7ksk37n9 --- addons/web/static/src/css/base.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4bd920eb3ab..44d7ac89c8b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1113,12 +1113,17 @@ label.error { } /* Uneditable Form View */ +.openerp .oe_form_readonly { + +} .openerp .oe_form_readonly .field_char, .openerp .oe_form_readonly .oe_form_field_email { - padding-top:4px; + padding-top:4px; + background-color:white; } .openerp .oe_form_readonly .field_selection { padding-top:2px; + background-color:white; } From b552ff1991575bf167e2fe889521aa9268ecd7fc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 30 Nov 2011 14:11:54 +0100 Subject: [PATCH 19/23] [IMP] Seperate menu tips from action view manager's content bzr revid: fme@openerp.com-20111130131154-cu9hrcxyjvw15wnc --- addons/web/static/src/js/views.js | 6 +++--- addons/web/static/src/xml/base.xml | 28 ++++++++++++++++++---------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 582a526e57a..b19cf7a7626 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -426,8 +426,8 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner }); if (this.action.help && !this.flags.low_profile) { var Users = new session.web.DataSet(self, 'res.users'), - header = this.$element.find('.oe-view-manager-header'); - header.delegate('blockquote button', 'click', function() { + $tips = this.$element.find('.oe_view_manager_menu_tips'); + $tips.delegate('blockquote button', 'click', function() { var $this = $(this); //noinspection FallthroughInSwitchStatementJS switch ($this.attr('name')) { @@ -444,7 +444,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner if (!(user && user.id === self.session.uid)) { return; } - header.find('blockquote').toggle(user.menu_tips); + $tips.find('blockquote').toggle(user.menu_tips); }); } } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 23fa97ce7f5..754364c6c8d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -418,6 +418,7 @@ + +
@@ -443,21 +444,28 @@
+ + + +
+

+
+ + +
+
+ + + -
-

-
- - -
-
- + From 9e965230f6b06c90931915836c12b8e01cbda905 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 30 Nov 2011 14:25:43 +0100 Subject: [PATCH 20/23] [IMP] Include star shortcut in the view title h2 element bzr revid: fme@openerp.com-20111130132543-fcl4avnrmpryaryt --- addons/web/static/src/js/views.js | 6 +++--- addons/web/static/src/xml/base.xml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index b19cf7a7626..e8af1290e48 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -280,7 +280,7 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View } } $.when(view_promise).then(function () { - self.$element.find('.oe_view_title:first').text( + self.$element.find('.oe_view_title_text:first').text( self.display_title()); }); return view_promise; @@ -472,10 +472,10 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner view_id = (fvg && fvg.view_id) || '--'; self.$element.find('.oe_get_xml_view span').text(view_id); if (!self.action.name && fvg) { - self.$element.find('.oe_view_title').text(fvg.arch.attrs.string || fvg.name); + self.$element.find('.oe_view_title_text').text(fvg.arch.attrs.string || fvg.name); } - var $title = self.$element.find('.oe_view_title'), + var $title = self.$element.find('.oe_view_title_text'), $search_prefix = $title.find('span.oe_searchable_view'); if (controller.searchable !== false) { if (!$search_prefix.length) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 754364c6c8d..e097c4cd771 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -423,7 +423,7 @@

- +

@@ -463,9 +463,11 @@ - + + + From a103f44748bbfc3c5767bbf90b6e053d792af829 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 30 Nov 2011 14:54:48 +0100 Subject: [PATCH 21/23] [IMP] css on list view header, changes in process.css for the small icon bzr revid: ahu@openerp.com-20111130135448-yuszw4ejewvd0ai8 --- addons/web/static/src/css/base.css | 44 +++++-------------- addons/web_process/static/src/css/process.css | 5 ++- 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8cb111f18b5..2397c903fe8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -13,28 +13,9 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio font-size:85%; } -.openerp .view-manager-main-content>div{ - padding:0px 8px; -} -.openerp .view-manager-main-content>div.oe-view-manager-header { - padding:0px; -} -.openerp .view-manager-main-content>div.oe-view-manager-header > a, .openerp .view-manager-main-content>div.oe-view-manager-header > div { - padding:0px 8px; -} - -.openerp .view-manager-main-content > div.oe-view-manager-header > a[style] + h2.oe_view_title{ /* Padding only for the view form title*/ - padding-left:10px; -} - -.openerp .view-manager-main-content .view-manager-main-content > div { /* No padding for other nested childs */ - padding-left:0px; - padding-right:0px; -} - - -.openerp .oe-dashboard-action .view-manager-main-content > div { - padding:0px 0px; +.openerp .view-manager-main-content { + width: 100%; + padding:0px 8px 8px 8px; } .oe_box { @@ -1306,17 +1287,13 @@ label.error { vertical-align: top; } -.openerp .view-manager-main-content { - width: 100%; - padding:0px; -} .openerp .oe-view-manager-header { overflow: auto; } .openerp .oe-view-manager-header h2 { float: left; } -.openerp .oe-view-manager-header blockquote { +.openerp .oe_view_manager_menu_tips blockquote { display: none; font-size: 85%; margin: 0; @@ -1325,14 +1302,14 @@ label.error { padding: 1px 10px; color: #4C4C4C; } -.openerp .oe-view-manager-header blockquote p { +.openerp .oe_view_manager_menu_tips blockquote p { margin: 0; padding: 6px 1px 4px; } -.openerp .oe-view-manager-header blockquote div { +.openerp .oe_view_manager_menu_tips blockquote div { text-align: right; } -.openerp .oe-view-manager-header blockquote div button { +.openerp .oe_view_manager_menu_tips blockquote div button { border: none; background: none; padding: 0 4px; @@ -1636,18 +1613,17 @@ label.error { /* Shortcuts*/ .oe-shortcut-toggle { height: 20px; + margin-top:3px; padding: 0; - margin-top:4px; width: 24px; cursor: pointer; display: block; - background: url(/web/static/src/img/add-shortcut.png) no-repeat bottom; + background: url(/web/static/src/img/add-shortcut.png) no-repeat center center; float: left; } .oe-shortcut-remove{ - background: url(/web/static/src/img/remove-shortcut.png) no-repeat bottom; + background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center; } -/* ================ */ .oe-shortcuts { position: absolute; margin: 0; diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css index ebb2267714c..cebc6b1e91f 100644 --- a/addons/web_process/static/src/css/process.css +++ b/addons/web_process/static/src/css/process.css @@ -52,11 +52,12 @@ a.cta-a strong { .oe-process-view { height: 20px; + margin-top:4px; padding: 0; width: 24px; cursor: pointer; display: block; - background: url(/web/static/src/img/icons/gtk-help.png) no-repeat bottom; + background: url(/web/static/src/img/icons/gtk-help.png) no-repeat center center; float: left; } @@ -69,4 +70,4 @@ a.cta-a strong { td.process_fields,button.toggle_fields span:last-child { display: none; -} \ No newline at end of file +} From 1525379a63a2320524a8d437e3d706470a0d5f7e Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 30 Nov 2011 15:13:27 +0100 Subject: [PATCH 22/23] [IMP] minimizing menu font size bzr revid: ahu@openerp.com-20111130141327-533b1tay8b0493h8 --- addons/web/static/src/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2397c903fe8..25152b35366 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -348,6 +348,7 @@ label.error { height: 100%; display: block; position: relative; + font-size:85%; } .openerp .secondary_menu.oe_folded { width: 20px; From 908c25f87ace9b50ef13df06120605a2ce558e01 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 30 Nov 2011 15:37:49 +0100 Subject: [PATCH 23/23] [IMP] changes in checkbox padding bzr revid: ahu@openerp.com-20111130143749-apkoxrneci57mnnj --- addons/web/static/src/css/base.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 25152b35366..5d81c52dd4f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -977,8 +977,9 @@ label.error { /* Form */ + .openerp .oe_form_frame_cell input[type="checkbox"] { - margin-top:5px; + margin-top:3px; vertical-align:center; } .openerp .oe_form_frame_cell .input[type="text"] { @@ -1013,6 +1014,9 @@ label.error { padding: 2px; position: relative; } +.openerp td.oe_form_field_boolean { + padding-top: 4px; +} .openerp td.oe_form_frame_cell.oe_form_group { padding: 0; }