From 3cfbe2e829795934debf9e50083b572de0c1fdeb Mon Sep 17 00:00:00 2001 From: Liam Noonan Date: Tue, 16 Dec 2025 02:59:09 +0300 Subject: [PATCH 1/6] [IMP] web_theme_classic Add ability to toggle theme Now you can either enable by user with Classic Theme Persistent setting, or toggle it on and off like dark mode. It uses a cookie to remember your preference between reloads. --- web_theme_classic/README.rst | 32 ++- web_theme_classic/__init__.py | 1 + web_theme_classic/__manifest__.py | 7 + web_theme_classic/models/__init__.py | 1 + web_theme_classic/models/ir_http.py | 28 +++ web_theme_classic/models/res_users.py | 31 +++ .../models/res_users_settings.py | 12 + web_theme_classic/readme/CONFIGURE.md | 7 + web_theme_classic/readme/DESCRIPTION.md | 8 +- .../static/description/index.html | 59 +++-- .../static/src/js/switch_theme.esm.js | 62 +++++ .../static/src/scss/web_theme_classic.scss | 215 +++++++++--------- web_theme_classic/tests/__init__.py | 1 + web_theme_classic/tests/test_ir_http.py | 91 ++++++++ web_theme_classic/views/res_users_views.xml | 27 +++ 15 files changed, 441 insertions(+), 141 deletions(-) create mode 100644 web_theme_classic/models/__init__.py create mode 100644 web_theme_classic/models/ir_http.py create mode 100644 web_theme_classic/models/res_users.py create mode 100644 web_theme_classic/models/res_users_settings.py create mode 100644 web_theme_classic/readme/CONFIGURE.md create mode 100644 web_theme_classic/static/src/js/switch_theme.esm.js create mode 100644 web_theme_classic/tests/__init__.py create mode 100644 web_theme_classic/tests/test_ir_http.py create mode 100644 web_theme_classic/views/res_users_views.xml diff --git a/web_theme_classic/README.rst b/web_theme_classic/README.rst index fd43959b27c1..e499fb66dfbb 100644 --- a/web_theme_classic/README.rst +++ b/web_theme_classic/README.rst @@ -1,7 +1,3 @@ -.. image:: https://odoo-community.org/readme-banner-image - :target: https://odoo-community.org/get-involved?utm_source=readme - :alt: Odoo Community Association - ================= Web Theme Classic ================= @@ -17,7 +13,7 @@ Web Theme Classic .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github @@ -32,15 +28,15 @@ Web Theme Classic |badge1| |badge2| |badge3| |badge4| |badge5| -This module extend the Odoo Community Edition ``web`` module to improve -visibility of form view. +This module extends the Odoo Community Edition ``web`` module to improve +the visibility of input fields. **Rational:** Since Odoo V17, the design is very pure. That's great, but it generates some problem for users : -- Fields are not identifiable. (we can not know exactly where there are +- Fields are not identifiable. (we can not know exactly where they are until you hover over them with the cursor) -- there is no indication for the required fields until trying to save +- There is no indication for the required fields until trying to save (or exit the screen) In a way, this module restores the form display of version 15, but @@ -62,6 +58,24 @@ preserving the "save on the fly" new feature. .. contents:: :local: +Configuration +============= + +This module allows each user to choose whether they would like input +fields to be displayed the "classic" way or the new, standard way (as if +this module were not installed) + +To do this you can either: + +- Check "Classic Theme Persistent" in user preferences. This will enable + the classic theme for that user across all devices. +- Check the "Classic Theme" toggle in the popover menu triggered bu + clicking on the user icon in the navbar. This toggle is only visible + when "Classic Theme Persistent" is disabled. + +Please note that when disabling "Classic Theme Persistent" the style +will not change until the page is reloaded. + Bug Tracker =========== diff --git a/web_theme_classic/__init__.py b/web_theme_classic/__init__.py index e69de29bb2d1..0650744f6bc6 100644 --- a/web_theme_classic/__init__.py +++ b/web_theme_classic/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/web_theme_classic/__manifest__.py b/web_theme_classic/__manifest__.py index 3a44b3e23790..13568120a799 100644 --- a/web_theme_classic/__manifest__.py +++ b/web_theme_classic/__manifest__.py @@ -1,5 +1,6 @@ # Copyright (C) 2022 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# © 2025 Liam Noonan - Pyxiris # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { @@ -14,8 +15,14 @@ "depends": [ "web", ], + "data": [ + "views/res_users_views.xml", + ], "assets": { "web.assets_backend": [ + "web_theme_classic/static/src/js/switch_theme.esm.js", + ], + "web.assets_web": [ "/web_theme_classic/static/src/scss/web_theme_classic.scss", ], "web.assets_web_dark": [ diff --git a/web_theme_classic/models/__init__.py b/web_theme_classic/models/__init__.py new file mode 100644 index 000000000000..604d2da2838e --- /dev/null +++ b/web_theme_classic/models/__init__.py @@ -0,0 +1 @@ +from . import ir_http, res_users, res_users_settings diff --git a/web_theme_classic/models/ir_http.py b/web_theme_classic/models/ir_http.py new file mode 100644 index 000000000000..57c4b72eb901 --- /dev/null +++ b/web_theme_classic/models/ir_http.py @@ -0,0 +1,28 @@ +# © 2022 Florian Kantelberg - initOS GmbH +# © 2025 Liam Noonan - Pyxiris +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models +from odoo.http import request + + +class IrHttp(models.AbstractModel): + _inherit = "ir.http" + + @classmethod + def _set_classic_theme(cls, response): + user = request.env.user + if user and user._is_internal(): + existing_transient_theme = request.httprequest.cookies.get( + "transient_classic_theme_cookie" + ) + persistent_theme = getattr(user, "persistent_classic_theme", None) + # Delete the cookie so that when persistent gets turned off the user + # will not be left wondering why nothing changed + if persistent_theme and existing_transient_theme: + response.delete_cookie("transient_classic_theme_cookie") + + @classmethod + def _post_dispatch(cls, response): + cls._set_classic_theme(response) + return super()._post_dispatch(response) diff --git a/web_theme_classic/models/res_users.py b/web_theme_classic/models/res_users.py new file mode 100644 index 000000000000..f6c4683e4c58 --- /dev/null +++ b/web_theme_classic/models/res_users.py @@ -0,0 +1,31 @@ +# © 2022 Florian Kantelberg - initOS GmbH +# © 2025 Liam Noonan - Pyxiris +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResUsers(models.Model): + _inherit = "res.users" + + persistent_classic_theme = fields.Boolean( + related="res_users_settings_id.persistent_classic_theme", + readonly=False, + string="Classic Theme Persistent", + help="This enables Classic Theme on this user's account across all devices. \n " + "Disabling it will will alow you to to use the toggle in the user burger menu " + "in the navbar to enable Classic Mode on a specific session/device \n" + "The toggle is not visible while Persistent Classic Theme is enabled", + ) + + @property + def SELF_READABLE_FIELDS(self): + return super().SELF_READABLE_FIELDS + [ + "persistent_classic_theme", + ] + + @property + def SELF_WRITEABLE_FIELDS(self): + return super().SELF_WRITEABLE_FIELDS + [ + "persistent_classic_theme", + ] diff --git a/web_theme_classic/models/res_users_settings.py b/web_theme_classic/models/res_users_settings.py new file mode 100644 index 000000000000..99b5fe33fdf0 --- /dev/null +++ b/web_theme_classic/models/res_users_settings.py @@ -0,0 +1,12 @@ +# © 2026 Liam Noonan - Pyxiris +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResUsersSettings(models.Model): + _inherit = "res.users.settings" + + # These fields should be here in order to be accessible via in js + # as user.settings.persistent_classic_theme + persistent_classic_theme = fields.Boolean(default=True) diff --git a/web_theme_classic/readme/CONFIGURE.md b/web_theme_classic/readme/CONFIGURE.md new file mode 100644 index 000000000000..2824ab8c8952 --- /dev/null +++ b/web_theme_classic/readme/CONFIGURE.md @@ -0,0 +1,7 @@ +This module allows each user to choose whether they would like input fields to be displayed the "classic" way or the new, standard way (as if this module were not installed) + +To do this you can either: ++ Check "Classic Theme Persistent" in user preferences. This will enable the classic theme for that user across all devices. ++ Check the "Classic Theme" toggle in the popover menu triggered bu clicking on the user icon in the navbar. This toggle is only visible when "Classic Theme Persistent" is disabled. + +Please note that when disabling "Classic Theme Persistent" the style will not change until the page is reloaded. diff --git a/web_theme_classic/readme/DESCRIPTION.md b/web_theme_classic/readme/DESCRIPTION.md index afc3f096e0c9..289a33630b07 100644 --- a/web_theme_classic/readme/DESCRIPTION.md +++ b/web_theme_classic/readme/DESCRIPTION.md @@ -1,12 +1,12 @@ -This module extend the Odoo Community Edition `web` module to improve -visibility of form view. +This module extends the Odoo Community Edition `web` module to improve +the visibility of input fields. **Rational:** Since Odoo V17, the design is very pure. That's great, but it generates some problem for users : - Fields are not identifiable. (we can not know exactly - where there are until you hover over them with the cursor) -- there is no indication for the required fields until trying to save + where they are until you hover over them with the cursor) +- There is no indication for the required fields until trying to save (or exit the screen) In a way, this module restores the form display of version 15, but diff --git a/web_theme_classic/static/description/index.html b/web_theme_classic/static/description/index.html index ecd35f6a0d6a..887dd65fcebe 100644 --- a/web_theme_classic/static/description/index.html +++ b/web_theme_classic/static/description/index.html @@ -3,7 +3,7 @@ -README.rst +Web Theme Classic -
+
+

Web Theme Classic

- - -Odoo Community Association - -
-

Web Theme Classic

-

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

-

This module extend the Odoo Community Edition web module to improve -visibility of form view.

+

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

+

This module extends the Odoo Community Edition web module to improve +the visibility of input fields.

Rational: Since Odoo V17, the design is very pure. That’s great, but it generates some problem for users :

    -
  • Fields are not identifiable. (we can not know exactly where there are +
  • Fields are not identifiable. (we can not know exactly where they are until you hover over them with the cursor)
    • -
  • there is no indication for the required fields until trying to save +
  • There is no indication for the required fields until trying to save (or exit the screen)

In a way, this module restores the form display of version 15, but @@ -394,17 +389,34 @@

Web Theme Classic

Table of contents

+
+

Configuration

+

This module allows each user to choose whether they would like input +fields to be displayed the “classic” way or the new, standard way (as if +this module were not installed)

+

To do this you can either:

+
    +
  • Check “Classic Theme Persistent” in user preferences. This will enable +the classic theme for that user across all devices.
    • +
  • Check the “Classic Theme” toggle in the popover menu triggered bu +clicking on the user icon in the navbar. This toggle is only visible +when “Classic Theme Persistent” is disabled.
    • +
+

Please note that when disabling “Classic Theme Persistent” the style +will not change until the page is reloaded.

+
-

Bug Tracker

+

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 @@ -412,15 +424,15 @@

Bug Tracker

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

-
diff --git a/web_theme_classic/static/src/js/switch_theme.esm.js b/web_theme_classic/static/src/js/switch_theme.esm.js new file mode 100644 index 000000000000..7efb15160017 --- /dev/null +++ b/web_theme_classic/static/src/js/switch_theme.esm.js @@ -0,0 +1,62 @@ +// © 2022 Florian Kantelberg - initOS GmbH +// © 2025 Liam Noonan - Pyxiris +// License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import {_t} from "@web/core/l10n/translation"; +import {browser} from "@web/core/browser/browser"; +import {cookie} from "@web/core/browser/cookie"; +import {registry} from "@web/core/registry"; +import {user} from "@web/core/user"; + +/** + * @param {import("@web/env").OdooEnv} env + */ +function classicThemeSwitchItem(env) { + return { + type: "switch", + id: "classic_theme.switch", + description: _t("Classic Theme"), + callback: () => { + env.services.classic_theme.switchTheme(); + }, + isChecked: cookie.get("transient_classic_theme_cookie") === "classic", + sequence: 43, + }; +} + +export const classicThemeService = { + dependencies: ["ui"], + + start(env, {ui}) { + // Apply theme on load + if ( + cookie.get("transient_classic_theme_cookie") === "classic" || + user.settings.persistent_classic_theme + ) { + document.body.classList.add("classic-theme"); + } + + if (!user.settings.persistent_classic_theme) { + registry + .category("user_menuitems") + .add("classic_theme.switch", classicThemeSwitchItem); + } + + return { + async switchTheme() { + const newValue = + cookie.get("transient_classic_theme_cookie") === "classic" + ? "pure" + : "classic"; + cookie.set("transient_classic_theme_cookie", newValue); + document.body.classList.toggle("classic-theme", newValue === "classic"); + + // We do not actually need a reload, but it does get rid of some style glitches + ui.block(); + browser.location.reload(); + }, + }; + }, +}; + +registry.category("services").add("classic_theme", classicThemeService); diff --git a/web_theme_classic/static/src/scss/web_theme_classic.scss b/web_theme_classic/static/src/scss/web_theme_classic.scss index c02f74187178..56b6ee42743c 100644 --- a/web_theme_classic/static/src/scss/web_theme_classic.scss +++ b/web_theme_classic/static/src/scss/web_theme_classic.scss @@ -27,147 +27,154 @@ $wtc-input-color-placeholder-required: #6c757d !default; /*********************************************************** Handle Borders ************************************************************/ - -/* Odoo sets this without consideration for nesting, as occurs with custom properties. +// Only activate these styles when the classic-theme class is set on the body +body.classic-theme { + /* Odoo sets this without consideration for nesting, as occurs with custom properties. * https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/fields.scss#L36C1-L39C2 * We fix that here. We also use our special toned down version of $o-action for full borders */ -.o_field_widget:focus-within { - &:has(.o_field_widget) { - @include print-variable(o-input-border-color, $wtc-input-border-color); - @include print-variable(o-caret-color, $input-color); + .o_field_widget:focus-within { + &:has(.o_field_widget) { + @include print-variable(o-input-border-color, $wtc-input-border-color); + @include print-variable(o-caret-color, $input-color); + } + @include print-variable(o-input-border-color, $wtc-input-border-color-focus); + @include print-variable(o-caret-color, $wtc-input-border-color-focus); } - @include print-variable(o-input-border-color, $wtc-input-border-color-focus); - @include print-variable(o-caret-color, $wtc-input-border-color-focus); -} -// https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/fields.scss#L50C1-L65C2 -.o_input { - border: $input-border-width solid var(--o-input-border-color); - border-radius: 3px; -} + // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/fields.scss#L50C1-L65C2 + .o_input { + border: $input-border-width solid var(--o-input-border-color); + border-radius: 3px; + } -// An odd case. The search input when adding a new user to an existing task from kanban -// https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss#L62C9-L62C55 -.o_m2m_tags_avatar_field_popover .o-autocomplete .o-autocomplete--input.o_input { - border-width: $input-border-width; - padding-left: $o-input-padding-x; -} + // An odd case. The search input when adding a new user to an existing task from kanban + // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss#L62C9-L62C55 + .o_m2m_tags_avatar_field_popover .o-autocomplete .o-autocomplete--input.o_input { + border-width: $input-border-width; + padding-left: $o-input-padding-x; + } -// All these selectors are probably not necessary, but just following: -// https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/properties/properties_field.scss#L12C1-L45C2 -.o_field_properties, -.o_field_properties.o_field_invalid, -.o_property_field_popover { - .o_input:focus, - .dropdown:focus ~ .o_dropdown_button, - .dropdown:focus-within ~ .o_dropdown_button, - .o_input:focus ~ .o_datepicker_button, - .o_dropdown_button:focus { - @include print-variable(o-input-border-color, $wtc-input-border-color-focus); - * { + // All these selectors are probably not necessary, but just following: + // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/properties/properties_field.scss#L12C1-L45C2 + .o_field_properties, + .o_field_properties.o_field_invalid, + .o_property_field_popover { + .o_input:focus, + .dropdown:focus ~ .o_dropdown_button, + .dropdown:focus-within ~ .o_dropdown_button, + .o_input:focus ~ .o_datepicker_button, + .o_dropdown_button:focus { @include print-variable( o-input-border-color, $wtc-input-border-color-focus ); + * { + @include print-variable( + o-input-border-color, + $wtc-input-border-color-focus + ); + } } } -} -// Give tag type custom properties input borders too. Note the code we are overriding -// https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/properties/property_value.scss#L43C1-L46C2 -.o_field_property_many2many_value:not(.readonly), + // Give tag type custom properties input borders too. Note the code we are overriding + // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/properties/property_value.scss#L43C1-L46C2 + .o_field_property_many2many_value:not(.readonly), // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/properties/property_tags.scss#L29C1-L32C2 .o_field_property_tag:not(.readonly) { - border: $input-border-width solid var(--o-input-border-color); - border-radius: 3px; -} - -.o_form_view { - /* Odoo sets borders to transparent unless hovered or focused. We override this. - * https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/form/form_controller.scss#L202C1-L204C6 */ - &:not(.o_field_highlight) - .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) - .o_input:not(:hover):not(:focus) { - --o-input-border-color: #{$wtc-input-border-color}; + border: $input-border-width solid var(--o-input-border-color); + border-radius: 3px; } - /* Monetary fields need some special help */ - .o_field_monetary { - /* Prevent having double border for monetary fields */ - span.o_input:has(~ input.o_input) { - border: $input-border-width solid transparent !important; + .o_form_view { + /* Odoo sets borders to transparent unless hovered or focused. We override this. + * https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/form/form_controller.scss#L202C1-L204C6 */ + &:not(.o_field_highlight) + .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) + .o_input:not(:hover):not(:focus) { + --o-input-border-color: #{$wtc-input-border-color}; } - /* Keep the monetary symbol away from the border when it is outside the border */ - /* For when the symbol is on the left side */ - span.o_input + span.opacity-0 { - margin-right: 3px; - } - /* For when the symbol is on the right side */ - span.o_input ~ span.opacity-0:not(span.o_input + span.opacity-0) { - margin-left: 3px; + /* Monetary fields need some special help */ + .o_field_monetary { + /* Prevent having double border for monetary fields */ + span.o_input:has(~ input.o_input) { + border: $input-border-width solid transparent !important; + } + + /* Keep the monetary symbol away from the border when it is outside the border */ + /* For when the symbol is on the left side */ + span.o_input + span.opacity-0 { + margin-right: 3px; + } + /* For when the symbol is on the right side */ + span.o_input ~ span.opacity-0:not(span.o_input + span.opacity-0) { + margin-left: 3px; + } } } -} -/*********************************************************** + /*********************************************************** Form View : Handle Background for required fields ************************************************************/ -// https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/fields.scss#L31C1-L34C2 -.o_required_modifier { - @include print-variable( - o-input-background-color, - $wtc-input-background-color-required - ); -} + // https://github.com/odoo/odoo/blob/18.0/addons/web/static/src/views/fields/fields.scss#L31C1-L34C2 + .o_required_modifier { + @include print-variable( + o-input-background-color, + $wtc-input-background-color-required + ); + } -/*********************************************************** + /*********************************************************** Tree View : Handle style for input fields ************************************************************/ -// We override all lists, not just in forms -.o_list_renderer .o_data_row { - // Prevent item description from getting $wtc-input-background-color-required when row not in focus - &:not(.selected_row) .o_input { - background-color: initial; - } - &.o_selected_row > .o_data_cell { - &.o_required_modifier:not(.o_readonly_modifier), - &.o_invalid_cell:not(.o_readonly_modifier) { - /* Disable border bottom as the field has now a background */ - border-bottom: 0px; + // We override all lists, not just in forms + .o_list_renderer .o_data_row { + // Prevent item description from getting $wtc-input-background-color-required when row not in focus + &:not(.selected_row) .o_input { + background-color: initial; } - > .o_field_widget { - // We have to manually reintroduce the input invalid styles - &.o_field_invalid:not(.o_readonly_modifier):not(.o_invisible_modifier):has( - .o_input - ) { - --o-input-background-color: #{$o-input-invalid-bg}; - .o_input { - --o-input-border-color: #{$o-danger}; - } + &.o_selected_row > .o_data_cell { + &.o_required_modifier:not(.o_readonly_modifier), + &.o_invalid_cell:not(.o_readonly_modifier) { + /* Disable border bottom as the field has now a background */ + border-bottom: 0px; } - &:not(.o_readonly_modifier):not(.o_invisible_modifier) { - &.o_required_modifier:not(.o_field_invalid) { + > .o_field_widget { + // We have to manually reintroduce the input invalid styles + &.o_field_invalid:not(.o_readonly_modifier):not( + .o_invisible_modifier + ):has(.o_input) { + --o-input-background-color: #{$o-input-invalid-bg}; .o_input { - color: $wtc-input-color-required; - --o-input-background-color: #{$wtc-input-background-color-required} !important; - background-color: var(--o-input-background-color) !important; + --o-input-border-color: #{$o-danger}; } } - // Handle borders - .o_input { - border: $input-border-width solid var(--o-input-border-color) !important; - /* Prevent double borders in nested o_input like tags */ + &:not(.o_readonly_modifier):not(.o_invisible_modifier) { + &.o_required_modifier:not(.o_field_invalid) { + .o_input { + color: $wtc-input-color-required; + --o-input-background-color: #{$wtc-input-background-color-required} !important; + background-color: var( + --o-input-background-color + ) !important; + } + } + // Handle borders .o_input { - border: 0 !important; + border: $input-border-width solid var(--o-input-border-color) !important; + /* Prevent double borders in nested o_input like tags */ + .o_input { + border: 0 !important; + } } } - } - // Handle monetary fields in list - &.o_field_monetary span.o_input:has(~ input.o_input) { - border: $input-border-width solid transparent !important; + // Handle monetary fields in list + &.o_field_monetary span.o_input:has(~ input.o_input) { + border: $input-border-width solid transparent !important; + } } } } diff --git a/web_theme_classic/tests/__init__.py b/web_theme_classic/tests/__init__.py new file mode 100644 index 000000000000..e2983aa2a489 --- /dev/null +++ b/web_theme_classic/tests/__init__.py @@ -0,0 +1 @@ +from . import test_ir_http diff --git a/web_theme_classic/tests/test_ir_http.py b/web_theme_classic/tests/test_ir_http.py new file mode 100644 index 000000000000..3b8db3adc904 --- /dev/null +++ b/web_theme_classic/tests/test_ir_http.py @@ -0,0 +1,91 @@ +# © 2022 Florian Kantelberg - initOS GmbH +# © 2026 Liam Noonan - Pyxiris +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import HttpCase, new_test_user, tagged + +HOST = "127.0.0.1" + + +@tagged("post_install", "-at_install") +class TestClassicTheme(HttpCase): + def setUp(self): + super().setUp() + self.test_portal_user = new_test_user( + self.env, "test_portal_user", groups="base.group_portal" + ) + # new_test_user() does not create a res_users_settings table for portal users + # for some reason, even though in an actual db this exists. We forcibly make + # it here so we can test that our logic does not run for portal users + self.env["res.users.settings"].create( + {"user_id": self.test_portal_user.id, "persistent_classic_theme": True} + ) + + self.test_internal_user = new_test_user( + self.env, "test_internal_user", groups="base.group_user" + ) + self.test_internal_user.write({"persistent_classic_theme": False}) + + # Non internal user -> skip logic, do nothing + def test_01_non_internal_user_ignored(self): + self.authenticate(self.test_portal_user.login, self.test_portal_user.login) + self.opener.cookies.set( + "transient_classic_theme_cookie", "pure", domain=HOST, path="/" + ) + response = self.url_open("/my") + cookie_header = response.headers.get("Set-Cookie", "") + self.assertNotIn( + "transient_classic_theme_cookie", + cookie_header, + "We should have skipped over this due to being an external user", + ) + + # Persistent theme not set, no cookie -> do nothing + def test_02_persistent_theme_not_set_no_cookie(self): + self.authenticate(self.test_internal_user.login, self.test_internal_user.login) + response = self.url_open("/odoo") + cookie_header = response.headers.get("Set-Cookie", "") + self.assertNotIn( + "transient_classic_theme_cookie", + cookie_header, + "Persistent is not set and there was no cookie, " + "so we should not be deleting the cookie", + ) + + # Persistent theme not set, cookie exists -> do nothing + def test_03_persistent_theme_not_set_cookie_exists(self): + self.authenticate(self.test_internal_user.login, self.test_internal_user.login) + self.opener.cookies.set( + "transient_classic_theme_cookie", "classic", domain=HOST, path="/" + ) + response = self.url_open("/odoo") + cookie_header = response.headers.get("Set-Cookie", "") + self.assertNotIn( + "transient_classic_theme_cookie", + cookie_header, + "Persistent is not set, so we should not be deleting the cookie", + ) + + # Persistent theme set, no cookie -> do nothing + def test_04_persistent_theme_set_no_cookie(self): + self.test_internal_user.write({"persistent_classic_theme": True}) + self.authenticate(self.test_internal_user.login, self.test_internal_user.login) + response = self.url_open("/odoo") + cookie_header = response.headers.get("Set-Cookie", "") + self.assertNotIn( + "transient_classic_theme_cookie", + cookie_header, + "Persistent is set but there was no cookie, " + "so we should not be deleting the cookie", + ) + + # Persistent theme set, cookie exists -> delete cookie + def test_05_persistent_theme_set_cookie_exists(self): + self.test_internal_user.write({"persistent_classic_theme": True}) + self.authenticate(self.test_internal_user.login, self.test_internal_user.login) + self.opener.cookies.set( + "transient_classic_theme_cookie", "classic", domain=HOST, path="/" + ) + response = self.url_open("/odoo") + cookie_header = response.headers.get("Set-Cookie", "") + self.assertIn("transient_classic_theme_cookie", cookie_header) diff --git a/web_theme_classic/views/res_users_views.xml b/web_theme_classic/views/res_users_views.xml new file mode 100644 index 000000000000..017481b2bef3 --- /dev/null +++ b/web_theme_classic/views/res_users_views.xml @@ -0,0 +1,27 @@ + + + + res.users + + + + + + + + + + + + res.users.form.web_theme_classic + res.users + + + + + + + + + + From 6d51c99851cccd7191c99778334c2425e9ae9b81 Mon Sep 17 00:00:00 2001 From: adrip-s73 Date: Mon, 20 Apr 2026 17:25:08 +0200 Subject: [PATCH 2/6] [18.0][FIX] web_m2x_options: prevent Owl crash when evaluateFieldBooleanOption receives an Array domain --- web_m2x_options/static/src/components/form.esm.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web_m2x_options/static/src/components/form.esm.js b/web_m2x_options/static/src/components/form.esm.js index e2fbe9ca7bb0..32d3875dcabc 100644 --- a/web_m2x_options/static/src/components/form.esm.js +++ b/web_m2x_options/static/src/components/form.esm.js @@ -32,7 +32,13 @@ function evaluateHasCreatePermission(attrs) { } function evaluateFieldBooleanOption(option) { - return typeof option === "boolean" ? option : evaluateBooleanExpr(option); + if (typeof option === "boolean") { + return option; + } + if (typeof option === "string") { + return evaluateBooleanExpr(option); + } + return true; } patch(many2OneField, { From e25961856196c0068a9a1b11463a89f6df0b01ad Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 23 Apr 2026 20:32:59 +0000 Subject: [PATCH 3/6] [BOT] post-merge updates --- README.md | 2 +- web_m2x_options/README.rst | 2 +- web_m2x_options/__manifest__.py | 2 +- web_m2x_options/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f67f64918b99..03eef2340a8a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ addon | version | maintainers | summary [web_group_expand](web_group_expand/) | 18.0.1.0.1 | | Group Expand Buttons [web_ir_actions_act_multi](web_ir_actions_act_multi/) | 18.0.1.0.0 | | Enables triggering of more than one action on ActionManager [web_ir_actions_act_window_message](web_ir_actions_act_window_message/) | 18.0.1.0.1 | | Show a message box to users -[web_m2x_options](web_m2x_options/) | 18.0.1.0.2 | | web_m2x_options +[web_m2x_options](web_m2x_options/) | 18.0.1.0.3 | | web_m2x_options [web_m2x_options_manager](web_m2x_options_manager/) | 18.0.1.0.0 | | Adds an interface to manage the "Create" and "Create and Edit" options for specific models and fields. [web_no_bubble](web_no_bubble/) | 18.0.1.0.0 | | Remove the bubbles from the web interface [web_notify](web_notify/) | 18.0.1.1.1 | | Send notification messages to user diff --git a/web_m2x_options/README.rst b/web_m2x_options/README.rst index cd1a461efec5..84c42c564f6e 100644 --- a/web_m2x_options/README.rst +++ b/web_m2x_options/README.rst @@ -11,7 +11,7 @@ web_m2x_options !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:5dd01fb787f522fb1380ac914658c801fb7cdcd937fe81ac52fb8db24298ee60 + !! source digest: sha256:72edae262a5750aa942302a30dfa960c912c99d637f4777222243f3e021f3924 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/web_m2x_options/__manifest__.py b/web_m2x_options/__manifest__.py index 3306e78e6fc4..e075c44e1a65 100644 --- a/web_m2x_options/__manifest__.py +++ b/web_m2x_options/__manifest__.py @@ -6,7 +6,7 @@ { "name": "web_m2x_options", - "version": "18.0.1.0.2", + "version": "18.0.1.0.3", "category": "Web", "author": "initOS GmbH," "ACSONE SA/NV, " diff --git a/web_m2x_options/static/description/index.html b/web_m2x_options/static/description/index.html index eada26a29d1a..181a3ea3e083 100644 --- a/web_m2x_options/static/description/index.html +++ b/web_m2x_options/static/description/index.html @@ -372,7 +372,7 @@

web_m2x_options

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:5dd01fb787f522fb1380ac914658c801fb7cdcd937fe81ac52fb8db24298ee60 +!! source digest: sha256:72edae262a5750aa942302a30dfa960c912c99d637f4777222243f3e021f3924 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This modules modifies “many2one” and “many2manytags” form widgets so as From 15e549c3ba43ce5b1e81a7d0765429b8a8616871 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Tue, 28 Apr 2026 07:13:45 +0000 Subject: [PATCH 4/6] [UPD] Update web_theme_classic.pot --- web_theme_classic/i18n/web_theme_classic.pot | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/web_theme_classic/i18n/web_theme_classic.pot b/web_theme_classic/i18n/web_theme_classic.pot index aadee09bfeda..ea3c52ebf70f 100644 --- a/web_theme_classic/i18n/web_theme_classic.pot +++ b/web_theme_classic/i18n/web_theme_classic.pot @@ -1,5 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: +# * web_theme_classic # msgid "" msgstr "" @@ -11,3 +12,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" + +#. module: web_theme_classic +#. odoo-javascript +#: code:addons/web_theme_classic/static/src/js/switch_theme.esm.js:0 +msgid "Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users__persistent_classic_theme +msgid "Classic Theme Persistent" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_ir_http +msgid "HTTP Routing" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users_settings__persistent_classic_theme +msgid "Persistent Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,help:web_theme_classic.field_res_users__persistent_classic_theme +msgid "" +"This enables Classic Theme on this user's account across all devices. \n" +" Disabling it will will alow you to to use the toggle in the user burger menu in the navbar to enable Classic Mode on a specific session/device \n" +"The toggle is not visible while Persistent Classic Theme is enabled" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users +msgid "User" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users_settings +msgid "User Settings" +msgstr "" From 1ed97ca565682629e9c692db91dc11c92d5bb438 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 28 Apr 2026 07:21:23 +0000 Subject: [PATCH 5/6] [BOT] post-merge updates --- README.md | 2 +- web_theme_classic/README.rst | 8 ++++-- web_theme_classic/__manifest__.py | 2 +- .../static/description/index.html | 28 +++++++++++-------- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 03eef2340a8a..58015aac5920 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ addon | version | maintainers | summary [web_session_auto_close](web_session_auto_close/) | 18.0.1.0.1 | | Automatically logs out inactive users based on a configurable timeout. [web_sort_menu](web_sort_menu/) | 18.0.1.0.0 | | Sort Apps in DropDown/NavBar Menu alphabetically [web_systray_button_init_action](web_systray_button_init_action/) | 18.0.1.0.2 | | Add a button to go to the user init action. -[web_theme_classic](web_theme_classic/) | 18.0.1.1.0 | legalsylvain | Contrasted style on fields to improve the UI. +[web_theme_classic](web_theme_classic/) | 18.0.1.2.0 | legalsylvain | Contrasted style on fields to improve the UI. [web_time_range_menu_custom](web_time_range_menu_custom/) | 18.0.1.0.0 | | Web Time Range Menu Custom [web_timeline](web_timeline/) | 18.0.1.0.3 | | Interactive visualization chart to show events in time [web_toggle_chatter](web_toggle_chatter/) | 18.0.1.0.0 | | Toggle chatter in backend form views diff --git a/web_theme_classic/README.rst b/web_theme_classic/README.rst index e499fb66dfbb..5825ab46e06f 100644 --- a/web_theme_classic/README.rst +++ b/web_theme_classic/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ================= Web Theme Classic ================= @@ -7,13 +11,13 @@ Web Theme Classic !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:27279023c56e7554295aea7c8e94ddad0c3cf9962ba5f11a6de4b8c1766e9e59 + !! source digest: sha256:96a272ee896986cd77dc37d08d7df63ad97290bbe73d90c2ac25139644f4ae70 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github diff --git a/web_theme_classic/__manifest__.py b/web_theme_classic/__manifest__.py index 13568120a799..9d189e05517b 100644 --- a/web_theme_classic/__manifest__.py +++ b/web_theme_classic/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Web Theme Classic", "summary": "Contrasted style on fields to improve the UI.", - "version": "18.0.1.1.0", + "version": "18.0.1.2.0", "author": "GRAP, Odoo Community Association (OCA)", "maintainers": ["legalsylvain"], "website": "https://github.com/OCA/web", diff --git a/web_theme_classic/static/description/index.html b/web_theme_classic/static/description/index.html index 887dd65fcebe..190aa5109dc1 100644 --- a/web_theme_classic/static/description/index.html +++ b/web_theme_classic/static/description/index.html @@ -3,7 +3,7 @@ -Web Theme Classic +README.rst -

-

Web Theme Classic

+
+ + +Odoo Community Association + +
+

Web Theme Classic

-

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

+

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

This module extends the Odoo Community Edition web module to improve the visibility of input fields.

Rational: Since Odoo V17, the design is very pure. That’s great, but @@ -400,7 +405,7 @@

Web Theme Classic

-

Configuration

+

Configuration

This module allows each user to choose whether they would like input fields to be displayed the “classic” way or the new, standard way (as if this module were not installed)

@@ -416,7 +421,7 @@

Configuration

will not change until the page is reloaded.

-

Bug Tracker

+

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 @@ -424,15 +429,15 @@

Bug Tracker

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

+
From 34246ba2594b394df6282619070b93bb95babf26 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 28 Apr 2026 07:21:33 +0000 Subject: [PATCH 6/6] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: web-18.0/web-18.0-web_theme_classic Translate-URL: https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_theme_classic/ --- web_theme_classic/i18n/it.po | 40 ++++++++++++++++++++++++++++++++++++ web_theme_classic/i18n/tr.po | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/web_theme_classic/i18n/it.po b/web_theme_classic/i18n/it.po index 8af45f7b8781..ec4b00c38cfc 100644 --- a/web_theme_classic/i18n/it.po +++ b/web_theme_classic/i18n/it.po @@ -12,3 +12,43 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: web_theme_classic +#. odoo-javascript +#: code:addons/web_theme_classic/static/src/js/switch_theme.esm.js:0 +msgid "Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users__persistent_classic_theme +msgid "Classic Theme Persistent" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_ir_http +msgid "HTTP Routing" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users_settings__persistent_classic_theme +msgid "Persistent Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,help:web_theme_classic.field_res_users__persistent_classic_theme +msgid "" +"This enables Classic Theme on this user's account across all devices. \n" +" Disabling it will will alow you to to use the toggle in the user burger " +"menu in the navbar to enable Classic Mode on a specific session/device \n" +"The toggle is not visible while Persistent Classic Theme is enabled" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users +msgid "User" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users_settings +msgid "User Settings" +msgstr "" diff --git a/web_theme_classic/i18n/tr.po b/web_theme_classic/i18n/tr.po index ebd417b4f9d9..d14f93f284ac 100644 --- a/web_theme_classic/i18n/tr.po +++ b/web_theme_classic/i18n/tr.po @@ -12,3 +12,43 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: web_theme_classic +#. odoo-javascript +#: code:addons/web_theme_classic/static/src/js/switch_theme.esm.js:0 +msgid "Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users__persistent_classic_theme +msgid "Classic Theme Persistent" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_ir_http +msgid "HTTP Routing" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,field_description:web_theme_classic.field_res_users_settings__persistent_classic_theme +msgid "Persistent Classic Theme" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model.fields,help:web_theme_classic.field_res_users__persistent_classic_theme +msgid "" +"This enables Classic Theme on this user's account across all devices. \n" +" Disabling it will will alow you to to use the toggle in the user burger " +"menu in the navbar to enable Classic Mode on a specific session/device \n" +"The toggle is not visible while Persistent Classic Theme is enabled" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users +msgid "User" +msgstr "" + +#. module: web_theme_classic +#: model:ir.model,name:web_theme_classic.model_res_users_settings +msgid "User Settings" +msgstr ""