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 00000000000..5400acec57b Binary files /dev/null and b/addons/web/static/src/img/iconset-a-help.gif differ diff --git a/addons/web/static/src/img/iconset-a-help.png b/addons/web/static/src/img/iconset-a-help.png new file mode 100644 index 00000000000..4af5ac170d6 Binary files /dev/null and b/addons/web/static/src/img/iconset-a-help.png differ 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 00000000000..02e7ef5be41 Binary files /dev/null and b/addons/web/static/src/img/pager_first.png differ 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 00000000000..26c7df05ec6 Binary files /dev/null and b/addons/web/static/src/img/pager_first_inactive.png differ 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 00000000000..c598a62c748 Binary files /dev/null and b/addons/web/static/src/img/pager_last.png differ diff --git a/addons/web/static/src/img/pager_last_inactive.png b/addons/web/static/src/img/pager_last_inactive.png new file mode 100644 index 00000000000..3ab5551e6e0 Binary files /dev/null and b/addons/web/static/src/img/pager_last_inactive.png differ 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 00000000000..e24b5a27566 Binary files /dev/null and b/addons/web/static/src/img/pager_left.png differ 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 00000000000..bea9c3f63b5 Binary files /dev/null and b/addons/web/static/src/img/pager_left_inactive.png differ 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 00000000000..bff268a52b9 Binary files /dev/null and b/addons/web/static/src/img/pager_right.png differ 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 00000000000..dd7cdc5de62 Binary files /dev/null and b/addons/web/static/src/img/pager_right_inactive.png differ 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 00000000000..5a064f21e89 Binary files /dev/null and b/addons/web/static/src/img/sep-a.gif differ 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 @@