diff --git a/web_chatter_position/README.rst b/web_chatter_position/README.rst index 45eeb803f5cf..05cc7945e71b 100644 --- a/web_chatter_position/README.rst +++ b/web_chatter_position/README.rst @@ -17,13 +17,13 @@ Chatter Position :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/17.0/web_chatter_position + :target: https://github.com/OCA/web/tree/18.0/web_chatter_position :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_chatter_position + :target: https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_chatter_position :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=17.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=18.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -66,19 +66,19 @@ Authors Contributors ------------ -- Hynsys Technologies -- Juan Miguel Sánchez Arce -- `Camptocamp `__ +- Hynsys Technologies +- Juan Miguel Sánchez Arce +- `Camptocamp `__ - - Iván Todorovich + - Iván Todorovich -- `Alitec Pte Ltd `__ +- `Alitec Pte Ltd `__ - - Jay Patel + - Jay Patel -- Trobz +- Trobz - - Tris Doan + - Tris Doan Maintainers ----------- @@ -101,6 +101,6 @@ Current `maintainer `__: |maintainer-trisdoan| -This module is part of the `OCA/web `_ project on GitHub. +This module is part of the `OCA/web `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_chatter_position/__manifest__.py b/web_chatter_position/__manifest__.py index 42069f638a15..fd305eac9d78 100644 --- a/web_chatter_position/__manifest__.py +++ b/web_chatter_position/__manifest__.py @@ -5,9 +5,9 @@ { "name": "Chatter Position", "summary": "Add an option to change the chatter position", - "version": "17.0.1.0.1", - "author": "Hynsys Technologies, Camptocamp, Alitec Pte Ltd, " - "Odoo Community Association (OCA)", + "version": "18.0.1.0.0", + "author": "Hynsys Technologies, Camptocamp, Alitec Pte Ltd," + " Odoo Community Association (OCA)", "maintainers": ["trisdoan"], "website": "https://github.com/OCA/web", "license": "LGPL-3", diff --git a/web_chatter_position/static/description/index.html b/web_chatter_position/static/description/index.html index dee54fa00717..23c66443a155 100644 --- a/web_chatter_position/static/description/index.html +++ b/web_chatter_position/static/description/index.html @@ -8,11 +8,10 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ +:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. -Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +274,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: gray; } /* line numbers */ +pre.code .ln { color: grey; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +300,7 @@ span.pre { white-space: pre } -span.problematic, pre.problematic { +span.problematic { color: red } span.section-subtitle { @@ -369,7 +368,7 @@

Chatter Position

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:37fa43641cb746a03b8cb4f0492784abb34e5b511d0d318013dcee341b792da4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/web Translate me on Weblate Try me on Runboat

+

Beta License: LGPL-3 OCA/web Translate me on Weblate Try me on Runboat

Configurable chatter position from the user preferences.

Supports Both Community & Enterprise Edition.

Table of contents

@@ -395,7 +394,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -430,15 +429,13 @@

Contributors

Maintainers

This module is maintained by the OCA.

- -Odoo Community Association - +Odoo Community Association

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

Current maintainer:

trisdoan

-

This module is part of the OCA/web project on GitHub.

+

This module is part of the OCA/web project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/web_chatter_position/static/src/js/web_chatter_position.esm.js b/web_chatter_position/static/src/js/web_chatter_position.esm.js index 42582fc4b836..a9ed39618068 100644 --- a/web_chatter_position/static/src/js/web_chatter_position.esm.js +++ b/web_chatter_position/static/src/js/web_chatter_position.esm.js @@ -1,4 +1,3 @@ -/** @odoo-module **/ /* Copyright 2023 Camptocamp SA (https://www.camptocamp.com). License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). @@ -22,15 +21,18 @@ patch(FormCompiler.prototype, { ".o-mail-Form-chatter:not(.o-isInFormSheetBg)" ); if (!chatterContainerHookXml) { - return res; // No chatter, keep the result as it is + // No chatter, keep the result as it is + return res; } const chatterContainerXml = chatterContainerHookXml.querySelector( "t[t-component='__comp__.mailComponents.Chatter']" ); + // Const chatterParent = chatterContainerXml.parentNode; const formSheetBgXml = res.querySelector(".o_form_sheet_bg"); const parentXml = formSheetBgXml && formSheetBgXml.parentNode; if (!parentXml) { - return res; // Miss-config: a sheet-bg is required for the rest + // Miss-config: a sheet-bg is required for the rest + return res; } // Don't patch anything if the setting is "auto": this is the core behaviour @@ -44,7 +46,7 @@ patch(FormCompiler.prototype, { isChatterAside: `__comp__.uiService.size >= ${SIZES.XXL}`, }); setAttributes(chatterContainerHookXml, { - "t-attf-class": `{{ __comp__.uiService.size >= ${SIZES.XXL} ? "o-aside" : "" }}`, + class: "o-aside", }); // For "bottom", we keep the chatter in the form sheet // (the one used for the attachment viewer case) @@ -67,7 +69,7 @@ patch(FormCompiler.prototype, { setAttributes(sheetBgChatterContainerHookXml, { "t-if": "true", "t-attf-class": `{{ (__comp__.uiService.size >= ${SIZES.XXL} && ${ - odoo.web_chatter_position != "bottom" + odoo.web_chatter_position !== "bottom" }) ? "o-aside" : "mt-4 mt-md-0" }}`, }); append(formSheetBgXml, sheetBgChatterContainerHookXml); @@ -86,4 +88,15 @@ patch(FormCompiler.prototype, { } return res; }, + compileForm(el, params) { + const form = super.compileForm(el, params); + const sheet = form.querySelector(".o_form_sheet_bg"); + if (sheet && odoo.web_chatter_position === "sided") { + setAttributes(form, { + "t-attf-class": "", + class: "d-flex d-print-block flex-nowrap h-100", + }); + } + return form; + }, });