From 23207c806670ced81733492c2287d3a1148c6726 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 20 Apr 2012 19:44:27 +0200 Subject: [PATCH 01/72] [IMP] Listview styling bzr revid: al@openerp.com-20120420174427-unoupanegd83equ4 --- addons/web/static/src/css/base.css | 118 ++++++++++++++++---------- addons/web/static/src/css/base.sass | 92 +++++++++++--------- addons/web/static/src/js/view_list.js | 7 +- addons/web/static/src/xml/base.xml | 2 +- 4 files changed, 129 insertions(+), 90 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2b90d47c002..22d3990700c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1629,46 +1629,6 @@ .openerp .oe-listview-content { width: 100%; } -.openerp .oe-listview-content thead, .openerp .oe-listview-content tfoot { - border-bottom: 1px solid #cacaca; - background: #eeeeee; -} -.openerp .oe-listview-content tfoot { - border-bottom: 1px solid #cacaca; - font-weight: bold; -} -.openerp .oe-listview-content tbody { - cursor: pointer; - background: white; -} -.openerp .oe-listview-content thead { - vertical-align: top; -} -.openerp .oe-listview-content td.oe_list_checkbox:first-child, .openerp .oe-listview-content th.oe_list_checkbox:first-child { - width: 17px; -} -.openerp .oe-listview-content td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content th.oe_list_checkbox:first-child:after { - border-width: 0; -} -.openerp .oe-listview-content tbody tr:nth-child(odd) td, .openerp .oe-listview-content tbody tr:nth-child(odd) th { - background-color: #f0f0fa; - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); -} -.openerp .oe-listview-content tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { - background-color: #eeeeee; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); - background-image: -moz-linear-gradient(top, #eeeeee, #dedede); - background-image: -ms-linear-gradient(top, #eeeeee, #dedede); - background-image: -o-linear-gradient(top, #eeeeee, #dedede); - background-image: linear-gradient(to bottom, #eeeeee, #dedede); -} .openerp .oe-listview-content td, .openerp .oe-listview-content th { padding: 3px 6px; line-height: 18px; @@ -1681,19 +1641,26 @@ -webkit-box-shadow: none; -box-shadow: none; } -.openerp .oe-listview-content .numeric { - text-align: right; - width: 82px; +.openerp .oe-listview-content thead { + border-bottom: 2px solid #cacaca; + background: #eeeeee; + vertical-align: top; } -.openerp .oe-listview-content .numeric input { - text-align: right; +.openerp .oe-listview-content thead th:after { + content: ""; + float: right; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: black transparent; + visibility: hidden; } -.openerp .oe-listview-content table .sortdown:after, .openerp .oe-listview-content table .sortdown:hover:after { +.openerp .oe-listview-content thead th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content table .sortup:after { +.openerp .oe-listview-content thead th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -1705,6 +1672,63 @@ filter: alpha(opacity=60); opacity: 0.6; } +.openerp .oe-listview-content thead th:hover:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid black; + visibility: visible; + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; + filter: alpha(opacity=60); + opacity: 0.6; +} +.openerp .oe-listview-content tbody { + cursor: pointer; + background: white; +} +.openerp .oe-listview-content tbody tr { + border-top: 1px solid #dddddd; +} +.openerp .oe-listview-content tbody tr:nth-child(odd) { + background-color: #f0f0fa; + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); +} +.openerp .oe-listview-content tfoot { + border-top: 2px solid #cacaca; + border-bottom: 1px solid #cacaca; + background: #eeeeee; + font-weight: bold; +} +.openerp .oe-listview-content tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { + background-color: #eeeeee; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); + background-image: -moz-linear-gradient(top, #eeeeee, #dedede); + background-image: -ms-linear-gradient(top, #eeeeee, #dedede); + background-image: -o-linear-gradient(top, #eeeeee, #dedede); + background-image: linear-gradient(to bottom, #eeeeee, #dedede); +} +.openerp .oe-listview-content td.oe_list_checkbox:first-child, .openerp .oe-listview-content th.oe_list_checkbox:first-child { + width: 17px; +} +.openerp .oe-listview-content td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content th.oe_list_checkbox:first-child:after { + border-width: 0; +} +.openerp .oe-listview-content .numeric { + text-align: right; + width: 82px; +} +.openerp .oe-listview-content .numeric input { + text-align: right; +} .openerp .oe_kanban_group_title { margin: 1px 1px 4px; font-size: 15px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fc645a92e44..db999f2598c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1375,26 +1375,6 @@ $colour4: #8a89ba font-size: 125% .oe-listview-content width: 100% - thead, tfoot - border-bottom: 1px solid #cacaca - background: #eee - tfoot - border-bottom: 1px solid #cacaca - font-weight: bold - tbody - cursor: pointer - background: white - thead - vertical-align: top - td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child - width: 17px - &:after - border-width: 0 - tbody tr:nth-child(odd) td, tbody tr:nth-child(odd) th - background-color: #f0f0fa - @include vertical-gradient(#f0f0fa, #eeeef6) - tbody tr:hover td, tbody tr:hover th - @include vertical-gradient(#eee, #dedede) td, th padding: 3px 6px line-height: 18px @@ -1403,30 +1383,64 @@ $colour4: #8a89ba background: transparent padding: 0 @include box-shadow(none) + thead + border-bottom: 2px solid #cacaca + background: #eee + vertical-align: top + th:after + content: "" + float: right + margin-top: 7px + border-width: 0 4px 4px + border-style: solid + border-color: #000 transparent + visibility: hidden + th.sortup:after + visibility: visible + @include opacity(0.6) + th.sortdown:after + border-bottom: none + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid #000 + visibility: visible + @include box-shadow(none) + @include opacity(0.6) + // TODO mit + //th:hover:after + // border-bottom: none + // border-left: 4px solid transparent + // border-right: 4px solid transparent + // border-top: 4px solid #000 + // visibility: visible + // @include box-shadow(none) + // @include opacity(0.6) + tbody + cursor: pointer + background: white + tr + border-top: 1px solid #ddd + tr:nth-child(odd) + background-color: #f0f0fa + @include vertical-gradient(#f0f0fa, #eeeef6) + tfoot + border-top: 2px solid #cacaca + border-bottom: 1px solid #cacaca + background: #eee + font-weight: bold + + tbody tr:hover td, tbody tr:hover th + @include vertical-gradient(#eee, #dedede) + + td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child + width: 17px + &:after + border-width: 0 .numeric text-align: right width: 82px input text-align: right - //thead th:after - //content: "" - //float: right - //margin-top: 7px - //border-width: 0 4px 4px - //border-style: solid - //border-color: #000 transparent - //visibility: hidden - table .sortdown:after, table .sortdown:hover:after - visibility: visible - @include opacity(0.6) - table .sortup:after - border-bottom: none - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid #000 - visibility: visible - @include box-shadow(none) - @include opacity(0.6) // }}} // KanbanView {{{ .oe_kanban_group_title diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 1fa3ca4fcee..ced727987b4 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -256,11 +256,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi e.stopPropagation(); var $this = $(this); self.dataset.sort($this.data('id')); - if ($this.find('span').length) { - $this.find('span').toggleClass( 'ui-icon-triangle-1-s ui-icon-triangle-1-n'); + if($this.hasClass("sortdown") || $this.hasClass("sortup")) { + $this.toggleClass("sortdown").toggleClass("sortup"); } else { - $this.append('') .siblings('.oe-sortable').find('span').remove(); + $this.toggleClass("sortdown"); } + $this.siblings('.oe-sortable').removeClass("sortup sortdown"); self.reload_content(); }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 57970c1486e..64998b4d40b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -607,7 +607,7 @@ - + + - - - + +
From 7ced323a0e23840118f643ee3d0e6f02c7059f60 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 20 Apr 2012 20:07:38 +0200 Subject: [PATCH 02/72] [FIX] view manager margin bzr revid: al@openerp.com-20120420180738-8pu70704j4niu4w3 --- addons/web/static/src/css/base.css | 25 +++++++++---------------- addons/web/static/src/css/base.sass | 9 ++++++--- addons/web/static/src/xml/base.xml | 28 ++++++++++++++++++++++------ 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 22d3990700c..439d8e8d0e8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -859,6 +859,15 @@ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } +.openerp .oe_view_manager_header2 .oe_view_manager_header2_row1 { + margin: 8px; +} +.openerp .oe_view_manager_header2 .oe_view_manager_header2_row2 { + margin: 8px; +} +.openerp .oe_view_manager_header2 td { + line-height: 26px; +} .openerp .oe_view_manager_header2 h2 { float: left; font-size: 18px; @@ -867,10 +876,6 @@ .openerp .oe_view_manager_header2 h2 a { color: #8a89ba; } -.openerp .oe_view_manager_header2 td { - padding: 4px 8px; - line-height: 26px; -} .openerp .oe_view_manager_header2 .oe_button_group { display: inline-block; border: 1px solid #ababab; @@ -1672,18 +1677,6 @@ filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content thead th:hover:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid black; - visibility: visible; - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; - filter: alpha(opacity=60); - opacity: 0.6; -} .openerp .oe-listview-content tbody { cursor: pointer; background: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index db999f2598c..8c726576a79 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -675,15 +675,18 @@ $colour4: #8a89ba border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1))) + .oe_view_manager_header2_row1 + margin: 8px + .oe_view_manager_header2_row2 + margin: 8px + td + line-height: 26px h2 float: left font-size: 18px margin: 1px 0 a color: $colour4 - td - padding: 4px 8px - line-height: 26px .oe_button_group display: inline-block border: 1px solid #ababab diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 64998b4d40b..c1b5e2e598a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -413,16 +413,31 @@
-

- -

+
+

+ +

+
+
+
+
+
+
+
+
+
+
+
+
+
From 6a982c90150d2095eebbe320a898ebbbb5a3b5d1 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 20 Apr 2012 20:27:15 +0200 Subject: [PATCH 03/72] [IMP] misc chrome css bzr revid: al@openerp.com-20120420182715-9w1aqwbmcvmvjrug --- addons/web/static/src/css/base.css | 9 ++++++++- addons/web/static/src/css/base.sass | 8 +++++++- addons/web/static/src/xml/base.xml | 3 +-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 439d8e8d0e8..deb677151a0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -107,6 +107,12 @@ .openerp .oe_wait { cursor: wait; } +.openerp .oe_fade { + color: #888888; +} +.openerp .oe_bold { + font-weight: bold; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { display: inline-block; border: 1px solid #ababab; @@ -500,6 +506,7 @@ background: #f0eeee; border-right: 1px solid #afafb6; text-shadow: 0 1px 1px white; + padding-bottom: 16px; } .openerp a.oe_logo { width: 220px; @@ -728,7 +735,7 @@ content: "&darr"; text-indent: -99999px; vertical-align: top; - margin-left: -8px; + margin-left: -12px; margin-top: 4px; margin-right: 4px; border-top: 4px solid transparent; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8c726576a79..96025c2461e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -133,6 +133,11 @@ $colour4: #8a89ba clear: both .oe_wait cursor: wait + .oe_fade + color: #888 + //font-size: 12px + .oe_bold + font-weight: bold // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'] @@ -408,6 +413,7 @@ $colour4: #8a89ba background: #f0eeee border-right: 1px solid #afafb6 text-shadow: 0 1px 1px white + padding-bottom: 16px a.oe_logo width: 220px display: block @@ -580,7 +586,7 @@ $colour4: #8a89ba content: "&darr" text-indent: -99999px vertical-align: top - margin-left: -8px + margin-left: -12px margin-top: 4px margin-right: 4px border-top: 4px solid transparent diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c1b5e2e598a..1082f84b51b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -731,8 +731,7 @@
- or - Discard + or Discard From d8d66845f16b726e105be51e7b885362f1c6ba8a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 23 Apr 2012 12:36:38 +0200 Subject: [PATCH 04/72] [FIX] Fixed button colspan in base_vat partner view bzr revid: fme@openerp.com-20120423103638-gtumi3b1uyzlccpe --- addons/base_vat/base_vat_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index 18480b47814..5abc0e13ca4 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -10,7 +10,7 @@ -