diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a39d3b9ab95..ba2de0e0e85 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -92,11 +92,9 @@ } .openerp2 .oe_left { float: left; - margin-right: 8px; } .openerp2 .oe_right { float: right; - margin-left: 8px; } .openerp2 .oe_clear { clear: both; @@ -929,11 +927,64 @@ .openerp2 .oe_view_manager_header .oe_view_manager_pager { float: right; } -.openerp2 .oe_view_manager_header .oe_previous:after { - content: "("; +.openerp2 .oe_pager_value { + height: 24px; + line-height: 24px; + padding: 0 8px; } -.openerp2 .oe_view_manager_header .oe_next:after { - content: ")"; +.openerp2 .oe_pager_group { + height: 24px; + line-height: 24px; + padding: 0 8px; + display: inline-block; + border: 1px solid #ababab; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +.openerp2 .oe_pager_group li { + height: 24px; + line-height: 24px; + padding: 0 8px; + float: left; + border-right: 1px solid #ababab; +} +.openerp2 .oe_pager_group li:last-child { + border: none; +} +.openerp2 .oe_pager_group a { + color: #4c4c4c; +} +.openerp2 .oe_pager_group a:hover { + text-decoration: none; +} +.openerp2 .oe_pager_group button { + height: 24px; + padding: 0; + background: transparent; + border: 0 none; + overflow: visible; +} +.openerp2 .oe_pager_group .active { + background: #999999; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; +} +.openerp2 .oe_pager_group .active a { + color: white; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); +} +.openerp2 .oe_pager_group .oe_view_manager_buttons { + padding-right: 8px; + float: left; + margin-right: 12px; +} +.openerp2 .oe_pager_group .oe_view_manager_sidebar { + display: inline-block; +} +.openerp2 .oe_pager_group .oe_view_manager_pager { + float: right; } .openerp2 .oe_view_manager_switch li { padding-left: 1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cc684d7df7a..957d436db31 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -728,6 +728,51 @@ $colour4: #8a89ba .oe_view_manager_pager float: right // }}} + // ViewManager.pager {{{ + .oe_pager_value + height: 24px + line-height: 24px + padding: 0 8px + .oe_pager_group + height: 24px + line-height: 24px + padding: 0 8px + display: inline-block + border: 1px solid #ababab + @include radius(5px) + li + height: 24px + line-height: 24px + padding: 0 8px + float: left + border-right: 1px solid #ababab + &:last-child + border: none + a + color: #4c4c4c + &:hover + text-decoration: none + button + height: 24px + padding: 0 + background: transparent + border: 0 none + overflow: visible + .active + background: #999 + @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) + a + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) + .oe_view_manager_buttons + padding-right: 8px + float: left + margin-right: 12px + .oe_view_manager_sidebar + display: inline-block + .oe_view_manager_pager + float: right + // }}} // ViewManager.switches {{{ .oe_view_manager_switch li diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 943ffcd3503..caa5d0ae257 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -95,7 +95,7 @@ openerp.web.FormView = openerp.web.View.extend({ .on('click','button.oe_form_button_delete',this.on_button_delete); this.$pager.html(QWeb.render("FormView.pager", {'widget':self})); - this.$pager.on('click','.oe_form_pager button[data-pager-action]',function(event) { + this.$pager.on('click','.oe_form_pager a[data-pager-action]',function(event) { var action = $(this).data('pager-action'); self.on_pager_action(action); }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4234379b296..27118a194e6 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -477,21 +477,27 @@ - - - - - - - + + + +