diff --git a/muk_web_theme/__manifest__.py b/muk_web_theme/__manifest__.py index f3dc412..003ff5b 100644 --- a/muk_web_theme/__manifest__.py +++ b/muk_web_theme/__manifest__.py @@ -19,7 +19,7 @@ { "name": "MuK Backend Theme", "summary": "Odoo Community Backend Theme", - "version": "12.0.1.4.9", + "version": "12.0.1.5.0", "category": "Themes/Backend", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_theme/doc/changelog.rst b/muk_web_theme/doc/changelog.rst index 81c3869..0d7dc68 100644 --- a/muk_web_theme/doc/changelog.rst +++ b/muk_web_theme/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.5.0` +------- + +- Mobile Pager Pages + `1.4.0` ------- diff --git a/muk_web_theme/static/src/js/chrome/pager.js b/muk_web_theme/static/src/js/chrome/pager.js new file mode 100644 index 0000000..5ef4266 --- /dev/null +++ b/muk_web_theme/static/src/js/chrome/pager.js @@ -0,0 +1,47 @@ +/********************************************************************************** +* +* Copyright (C) 2017 MuK IT GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +* +**********************************************************************************/ + +odoo.define('muk_web_theme.Pager', function (require) { +"use strict"; + +var core = require('web.core'); +var config = require("web.config"); + +var Pager = require('web.Pager'); + +var _t = core._t; +var QWeb = core.qweb; + +Pager.include({ + _render: function () { + this._super.apply(this, arguments); + if (this.state.size !== 0 && config.device.isMobile) { + this.$value.html(Math.ceil(this.state.current_max / this.state.limit)); + this.$limit.html(Math.ceil(this.state.size / this.state.limit)); + } + }, + _onEdit: function (event) { + if (!config.device.isMobile) { + this._super.apply(this, arguments); + } + event.stopPropagation(); + }, +}); + +}); \ No newline at end of file diff --git a/muk_web_theme/static/src/scss/control_panel.scss b/muk_web_theme/static/src/scss/control_panel.scss index e6285e8..ba21c46 100644 --- a/muk_web_theme/static/src/scss/control_panel.scss +++ b/muk_web_theme/static/src/scss/control_panel.scss @@ -19,6 +19,8 @@ @include media-breakpoint-down(sm) { .o_control_panel { + padding-left: $o-horizontal-padding /2; + padding-right: $o-horizontal-padding /2; .breadcrumb, .o_cp_buttons, .o_cp_left, .o_cp_right, .o_cp_searchview { flex: 1 1 100%; @include media-breakpoint-up(md) { @@ -49,9 +51,22 @@ } } } - .o_cp_left, .o_cp_right { - width: auto; - flex: 1 1 auto; + .o_cp_left { + flex-basis: 50%; + white-space: nowrap; + } + .o_cp_right { + flex-basis: 10%; + } + .o_cp_pager { + white-space: nowrap; + .o_pager_counter { + max-width: 60px; + @include o-text-overflow; + } + .o_pager_previous, .o_pager_next { + border: none; + } } .breadcrumb-item { &:not(.active) { @@ -87,11 +102,7 @@ justify-content: space-around; padding: 0; .btn { - border: { - bottom: 0; - radius: 0; - top: 0; - } + border: none; } } } diff --git a/muk_web_theme/template/assets.xml b/muk_web_theme/template/assets.xml index 581ed52..87a9ef6 100644 --- a/muk_web_theme/template/assets.xml +++ b/muk_web_theme/template/assets.xml @@ -60,6 +60,7 @@