From 5dd3318ca014d2e7ffb6f7c11fd76d7788447574 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 14 Dec 2011 12:52:06 +0100 Subject: [PATCH] [ADD] Adding images for pagers & pager styling bzr revid: ahu@openerp.com-20111214115206-xukqkaa0i1h9xd8c --- addons/web/static/src/css/base.css | 114 +++++++++++++++++- addons/web/static/src/img/iconset-a-help.gif | Bin 0 -> 379 bytes addons/web/static/src/img/iconset-a-help.png | Bin 0 -> 498 bytes addons/web/static/src/img/pager_first.png | Bin 0 -> 349 bytes .../static/src/img/pager_first_inactive.png | Bin 0 -> 270 bytes addons/web/static/src/img/pager_last.png | Bin 0 -> 345 bytes .../static/src/img/pager_last_inactive.png | Bin 0 -> 255 bytes addons/web/static/src/img/pager_left.png | Bin 0 -> 309 bytes .../static/src/img/pager_left_inactive.png | Bin 0 -> 192 bytes addons/web/static/src/img/pager_right.png | Bin 0 -> 301 bytes .../static/src/img/pager_right_inactive.png | Bin 0 -> 189 bytes addons/web/static/src/img/sep-a.gif | Bin 0 -> 43 bytes addons/web/static/src/xml/base.xml | 18 +-- addons/web_process/static/src/css/process.css | 4 +- 14 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 addons/web/static/src/img/iconset-a-help.gif create mode 100644 addons/web/static/src/img/iconset-a-help.png create mode 100644 addons/web/static/src/img/pager_first.png create mode 100644 addons/web/static/src/img/pager_first_inactive.png create mode 100644 addons/web/static/src/img/pager_last.png create mode 100644 addons/web/static/src/img/pager_last_inactive.png create mode 100644 addons/web/static/src/img/pager_left.png create mode 100644 addons/web/static/src/img/pager_left_inactive.png create mode 100644 addons/web/static/src/img/pager_right.png create mode 100644 addons/web/static/src/img/pager_right_inactive.png create mode 100644 addons/web/static/src/img/sep-a.gif diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0fa3a44a4cd..2593c12473e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -567,6 +567,7 @@ label.error { } .openerp .oe-view-manager-header .oe_view_title { font-size:150%; + padding:2px 0 0 0; } /* SearchView */ @@ -716,12 +717,17 @@ label.error { .openerp .oe_search-view-buttons { padding: 10px 0 10px 0; + vertical-align:middle; } .openerp .oe_search-view-custom-filter-btn span { background: url(/web/static/src/img/icons/gtk-add.png) repeat-y; padding-left: 18px; } +.openerp .oe_search-view-filters-management, .openerp .oe_search-view-custom-filter-btn { + float:right; +} + .openerp .searchview_extended_add_proposition span { font-size: 0.9em; background: url(/web/static/src/img/icons/gtk-add.png) repeat-y; @@ -870,6 +876,16 @@ label.error { color: #555; } +.openerp .oe-list-pager > *, .openerp .oe_form_pager *, .openerp .oe_pager_separator { + line-height:17px; + width:12px; + height:17px; + cursor: pointer; + color:gray; + font-weight:bold; + vertical-align:middle; + border:0; +} .openerp .oe-listview .oe-group-name { padding-right: 1em; } @@ -1079,7 +1095,7 @@ label.error { } .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help { - margin: 4px 0 0 3px; + margin: 3px 0 0 3px; white-space: nowrap; } .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 */ @@ -1149,6 +1165,11 @@ label.error { min-width: 90px; color: #1f1f1f; } +/* vertically recentering filter management select tag */ +.openerp select.oe_search-view-filters-management { + margin-top:2px; +} + .openerp .oe_forms select{ padding-top: 2px; } @@ -1159,6 +1180,7 @@ label.error { .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button { height: 22px; } + .openerp .oe_forms input.field_datetime { min-width: 11em; } @@ -1301,6 +1323,8 @@ label.error { .openerp .oe-view-manager-header { overflow: auto; + background: url("/web/static/src/img/sep-a.gif") 0 100% repeat-x; + margin-bottom:6px; } .openerp .oe-view-manager-header h2 { float: left; @@ -1318,9 +1342,11 @@ label.error { margin: 0; padding: 6px 1px 4px; } + .openerp .oe_view_manager_menu_tips blockquote div { text-align: right; } + .openerp .oe_view_manager_menu_tips blockquote div button { border: none; background: none; @@ -1732,3 +1758,89 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { .openerp .oe_view_editor_tree_grid a { display: block; } + +.openerp .oe_vm_switch { + margin:2px 10px 0px 0px; +} + +.openerp .oe_vm_switch button { + background: url("/web/static/src/img/views-icons-a.png") repeat-x scroll left top transparent; + overflow: hidden; + width: 22px; + height: 21px; + border: none; +} +.openerp .oe_vm_switch button[data-view-type="list"] { + background-position:0px 0px; +} +.openerp .oe_vm_switch button[data-view-type="list"]:active, +.openerp .oe_vm_switch button[data-view-type="list"]:hover, +.openerp .oe_vm_switch button[data-view-type="list"]:focus { + background-position:0px -21px; +} +.openerp .oe_vm_switch button[data-view-type="form"] { + background-position:-22px 0px; +} +.openerp .oe_vm_switch button[data-view-type="form"]:active, +.openerp .oe_vm_switch button[data-view-type="form"]:hover, +.openerp .oe_vm_switch button[data-view-type="form"]:focus { + background-position:-22px -21px; +} +.openerp .oe_vm_switch button[data-view-type="graph"] { + background-position:-44px0px; +} +.openerp .oe_vm_switch button[data-view-type="graph"]:active, +.openerp .oe_vm_switch button[data-view-type="graph"]:hover, +.openerp .oe_vm_switch button[data-view-type="graph"]:focus { + background-position:-44px -21px; +} +.openerp .oe_vm_switch button[data-view-type="gantt"] { + background-position:-66px 0px; +} +.openerp .oe_vm_switch button[data-view-type="gantt"]:active, +.openerp .oe_vm_switch button[data-view-type="gantt"]:hover, +.openerp .oe_vm_switch button[data-view-type="gantt"]:focus { + background-position:-66px -21px; +} +.openerp .oe_vm_switch button[data-view-type="calendar"] { + background-position:-88px 0px; +} +.openerp .oe_vm_switch button[data-view-type="calendar"]:active, +.openerp .oe_vm_switch button[data-view-type="calendar"]:hover, +.openerp .oe_vm_switch button[data-view-type="calendar"]:focus { + background-position:-88px -21px; +} +.openerp .oe_vm_switch button[data-view-type="kanban"] { + background-position:-110px 0px; +} +.openerp .oe_vm_switch button[data-view-type="kanban"]:active, +.openerp .oe_vm_switch button[data-view-type="kanban"]:hover, +.openerp .oe_vm_switch button[data-view-type="kanban"]:focus { + background-position:-110px -21px; +} + +.openerp .oe_vm_switch button[data-view-type="diagram"] { + background-position:0px 0px; +} +.openerp .oe_vm_switch button[data-view-type="diagram"]:active, +.openerp .oe_vm_switch button[data-view-type="diagram"]:hover, +.openerp .oe_vm_switch button[data-view-type="diagram"]:focus { + background-position:0px -21px; +} + +.openerp .oe-list-pager button[disabled="disabled"], .openerp .oe_form_pager button[disabled="disabled"] { + opacity:0.5; + filter:alpha(opacity=50); /* For IE8 and earlier */ +} +.openerp .oe-list-pager button[data-pager-action="first"], .openerp .oe_form_pager button[data-pager-action="first"] { + background: url("/web/static/src/img/pager_first.png") no-repeat scroll center center transparent; +} +.openerp .oe-list-pager button[data-pager-action="previous"], .openerp .oe_form_pager button[data-pager-action="previous"] { + background: url("/web/static/src/img/pager_left.png") no-repeat scroll center center transparent; +} +.openerp .oe-list-pager button[data-pager-action="next"], .openerp .oe_form_pager button[data-pager-action="next"] { + background: url("/web/static/src/img/pager_right.png") no-repeat scroll center center transparent; +} +.openerp .oe-list-pager button[data-pager-action="last"], .openerp .oe_form_pager button[data-pager-action="last"] { + background: url("/web/static/src/img/pager_last.png") no-repeat scroll center center transparent; +} diff --git a/addons/web/static/src/img/iconset-a-help.gif b/addons/web/static/src/img/iconset-a-help.gif new file mode 100644 index 0000000000000000000000000000000000000000..5400acec57bd30ea50c05765808d2d20684a6f90 GIT binary patch literal 379 zcmV->0fhcXNk%w1VGaNe0M$MK@$m5T^Yiuf_4D%b_xJbd=jZF|>)qSi|NsBt-{11_ z@#^X6-rU^r@$u~H>h10A?d$96=;+wj*W%#dt*x!**wa??(FRA>FMa^=JxjX{r&y)^z`N9gww5?(XpL@cjJz?Ck9C?d@Dy zSpWb4A^8LW002G!EC2ui01f~S000J^fY5NrK7qlY#sZD<0W&f-H9Cem6ev80H8wU1IgvRb9FUO! zHWe=qJe{7M4=)u3A_h38CKRVQ1|9_v69)@7H#IY~3kMSrJrNce2`{uS2^kgPx#y--Y4MF0Q*@$m5T^Yiuf_4D%b_xJbd=jZF|>)qSi|NsBt-{11_@#^X6-rU^r z@$u~H>h10A?d$96=;+wj*W%#dt*x!**wa? z?(FRA>FMa^=JxjX{r&y)^z`N9gww5?(XpL@cjJz?Ck9C?d>$JGdKVM00DGT zPE!Ct=GbNc0004EOGiWihy@);00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-mq z4hjGoVfUcY0001?Nklc)?PIg&MZT^8w;v|B z3@lp=c=l$ti}7$6!onVY>>>ntr*vI+3RoyB8600V2x)6V4Apmlx>2eZgcN!jx#Nx! on_ixKCN8IyfXb|@vJ$cP3lVl1t$_*kW&i*H07*qoM6N<$f^v!v$^ZZW literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_first.png b/addons/web/static/src/img/pager_first.png new file mode 100644 index 0000000000000000000000000000000000000000..02e7ef5be41529c7ba7021e7e81e2903a48bfc00 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!2%>7RxY^$q!^2X+?^QKos)S9taCTnP!j z6wthbwdM0~ zE2iAMz`@z;vIpZk{x!!Y`5Fn^`%lhgQ2({nJvPk2?XvscMB#?8tkS!Bk!&00Y|&8h zmE9XTHJ`!Ba`U_W8t(J=g-9^;#DAU8KeM6x#_ny!Z5E~Xy60S&$=R@2TdO6L@%_x; q>hjE)_WWga^ZJf6yw$z_oAv1*x4&o1b1i_LW$<+Mb6Mw<&;$TheuaMk literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_first_inactive.png b/addons/web/static/src/img/pager_first_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..26c7df05ec681d569a2052264b84a861ec150830 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWoCO|{#S9GG!XV7ZFl&wkQ1F1K zi(`ny<>Vjd8>AN%T=QC&)V5(-XU;RHi7~5osgw(vM|jmlp3)LkIT`xubl3FIb1bXk zRkqn=Rvy-J-SNbzcWLWs>1os6KaWt`q?2079J8r0v-Q>{r3nW%ZF(AX`jVs0jwdlI zm;MxJR4qNdSrN$7dbX79w3Y*t_vz_cx|$9XS)_AVOoTLU9^dIz6{**y!m-XEDsJBz zrZ-VLQzJ7b{g<33t*6`aqj=??NjW0*PECnw+AUi>@}%WwsodM(+RmW4bKgYmtxoYk Pzc6^Z`njxgN@xNA+mB~; literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_last.png b/addons/web/static/src/img/pager_last.png new file mode 100644 index 0000000000000000000000000000000000000000..c598a62c7484d391ce276342eee5f1548a6875ed GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!2%>7RxY^$q!^2X+?^QKos)S9za`BE3f=W|aSV~T?AmYW z?UX3dI{*9YxG5Ztg~eGL7DPFzzhwU*zK$d5kw8nm;w`C|S%;)#Sl&O)Q~by5D86uE zTiZ0Hg50bfcixwNsH<4U-2PmKuTV8dqs!==|7`2!8pr0{p8kPLp?t~W4c=;#)ryV< zUukgBG??>k6GH>Htb6I~NkNm^U;MhagTXIn&U(gxYl&O`zNuap-1l`N6NBqc>zZVjd8>Ec{Cfqr;-GlGY%#*u9M16~m*PCmaR-;PeB~fqQFvGdKCIf z;~&c_q4poeo_a+F3>VYZr78)W(|Wdbl1sZT!>aOq6Qk!di2@zZ;OXk;vd$@?2>=0R BUz-2` literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_left.png b/addons/web/static/src/img/pager_left.png new file mode 100644 index 0000000000000000000000000000000000000000..e24b5a275661d455326f054a684a32acfa136e87 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRO!3HEZ#7tidq!^2X+?^QKos)S9lPwmBbuY{qMU z7J=g*Pe(~JPXD&%yZZAvBCZ?R`|iJArS<<2Z_@n`j+PXQ7eEg%c)I$ztaD0e0svts Bco_fy literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_left_inactive.png b/addons/web/static/src/img/pager_left_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..bea9c3f63b53667764aecfa79f6215006e9b6f72 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_c25__kcwMtFYM)QHV|lgm>^($ zVY6eD3xBXmPGf+OP0#=7A2Oaava;I?@9al1@f%;QPMzcwnUE*04_ rlk;=hp^U@>f6`^vq#wEy|B&&=3>`67|DOs#Coy=s`njxgN@xNA20}|w literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_right.png b/addons/web/static/src/img/pager_right.png new file mode 100644 index 0000000000000000000000000000000000000000..bff268a52b9f8b2ba445271cade4e14685cadee4 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=fm(z?n2}-D90{Nxdx@v7EBkG3ISy^kq88^CpwL=R7sn8Z%e@y2 zxeghKus!&{l-DV3u%(+)ByHaC7t?H-7#z pHQsAy@0pW&Gfwj>i-P7KMiyVsvPJpcDnN%bc)I$ztaD0e0sxwYZg~Iz literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/pager_right_inactive.png b/addons/web/static/src/img/pager_right_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..dd7cdc5de62710113202ff227200816fd7961031 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_7Ec$)kcwMdFP-K+WFWwD;eo>S z1GcgSu6Gu4d58zPBy@k=&pACUP1W3>L&j~Bj%}ss>xEmt1^?p?_6pWKddZ;0K-v7k z#HM?{(|ZC%x;qvwEPmH}=W8lgR>8erH>Ne!K4ER08@WR%{Ejr+K9Rtu3iIcDZjEA} nRZ~*3KtampYE=L3KUejO7wd@a)zG{SbPt24tDnm{r-UW|H^52K literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/sep-a.gif b/addons/web/static/src/img/sep-a.gif new file mode 100644 index 0000000000000000000000000000000000000000..5a064f21e89f03e8e6ffd1b898fa51b2fae272e0 GIT binary patch literal 43 scmZ?wbhEHbWMp7sXkcKtd;9jUpFb6UvM_*v4u}BBFfcK>a4}c|00`s>g#Z8m literal 0 HcmV?d00001 diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f1f8990bfc5..57ac42cc25f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -630,17 +630,17 @@ + data-pager-action="first"> + data-pager-action="previous"> + data-pager-action="next"> + data-pager-action="last"> @@ -683,13 +683,13 @@
- - + + - 0 / 0 + 0 / 0 - - + +
diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css index cebc6b1e91f..728450fb921 100644 --- a/addons/web_process/static/src/css/process.css +++ b/addons/web_process/static/src/css/process.css @@ -52,12 +52,12 @@ a.cta-a strong { .oe-process-view { height: 20px; - margin-top:4px; + margin-top:8px; padding: 0; width: 24px; cursor: pointer; display: block; - background: url(/web/static/src/img/icons/gtk-help.png) no-repeat center center; + background: url(/web/static/src/img/iconset-a-help.png) no-repeat center center; float: left; }