diff options
| author | Antoine Huvelle <ahu@openerp.com> | 2011-12-22 10:50:28 +0100 |
|---|---|---|
| committer | Antoine Huvelle <ahu@openerp.com> | 2011-12-22 10:50:28 +0100 |
| commit | 628f0ff9aeff7acf8565b92f66ca0f75a998552e (patch) | |
| tree | 676fcb635a5d399805ad008c10b2595aa0d3ae81 /addons/web/static | |
| parent | cb1cae8b20520ef5f31347bc9c53d316850861bc (diff) | |
[imp] Bottom pager same padding as top pager
bzr revid: ahu@openerp.com-20111222095028-68ohzgepg9yx3q0x
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/css/base.css | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 12 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 |
3 files changed, 19 insertions, 5 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f2059992555..981edfdc077 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -912,6 +912,9 @@ label.error { font-weight: bold; vertical-align: middle; } +.openerp tfoot .oe-list-pager { + padding:0 6px 8px 0; +} .openerp .oe_button.oe_button_pager, .openerp .oe_button.oe_button_pager:disabled { padding: 0 3px 0 3px; @@ -1396,6 +1399,10 @@ label.error { background-color: white; } +.openerp tfoot.ui-widget-header { /* adding some space to the footer */ + padding-bottom: 10px; +} + /* Sidebar */ .openerp .view-manager-main-table { margin: 0; diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 73f9beb38aa..04f381b47c3 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -215,7 +215,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $(self.groups).trigger( 'selected', [selection.ids, selection.records]); }); - this.$element.find('.oe-list-add') .click(this.do_add_record) .attr('disabled', grouped && this.options.editable); @@ -234,8 +233,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $this.append('<span class="ui-icon ui-icon-triangle-1-s">') .siblings('.oe-sortable').find('span').remove(); } - + self.reload_content(); + }); this.$element.find('.oe-list-pager') @@ -274,7 +274,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# self.reload_content(); }) .val(self._limit || 'NaN'); - }); + }) + if (!this.sidebar && this.options.sidebar && this.options.sidebar_id) { this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id); this.sidebar.start(); @@ -314,6 +315,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# .end() .find('button[data-pager-action=last], button[data-pager-action=next]') .attr('disabled', last === total); + + /* if(this.dataset.ids.length < this.limit()) { + this.$element.find('.oe-list-pager').css('display','none'); + } */ }, /** * Sets up the listview's columns: merges view and fields data, move @@ -469,6 +474,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# page: this.page, limit: this._limit }); + return reloaded.promise(); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fe7b511e1cc..781ec6ad98e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -427,7 +427,7 @@ </blockquote> </td> <td rowspan="3" class="view-manager-main-sidebar" height="100%"> - <t t-foreach="views" t-as="view"> + <t t-foreach="views" t-as="view"> <div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/> </t> </td> @@ -452,7 +452,8 @@ <div t-attf-id="#{prefix}_view_#{view.view_type}"/> </t> </td> - + <td> + </td> </tr> </tbody> </table> |