From 85bbd8a20e3fb4ab84d1d8515eae9fd846c64c09 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 30 May 2026 22:36:38 -0400 Subject: [PATCH] fix(portal): recover full-bleed wrapper fix + Schedule Payslips tab These round-2 portal fixes (white-border wrapper neutralisation in portal_clock.css, and the Payslips nav tab on the fusion_planning Schedule page) were briefly bundled into a concurrent NFC commit that a parallel session then rebased, dropping them from main. They are deployed and verified on entech (fusion_clock 3.12.3 / fusion_planning 1.3.0); re-committing so git matches. Co-Authored-By: Claude Opus 4.8 --- fusion_clock/static/src/css/portal_clock.css | 20 ++++++++++++++++++- fusion_planning/__manifest__.py | 2 +- .../controllers/portal_schedule.py | 3 +++ .../views/portal_schedule_templates.xml | 9 +++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/fusion_clock/static/src/css/portal_clock.css b/fusion_clock/static/src/css/portal_clock.css index 10a78c87..1ac8a69f 100644 --- a/fusion_clock/static/src/css/portal_clock.css +++ b/fusion_clock/static/src/css/portal_clock.css @@ -21,7 +21,7 @@ --fclk-shadow: 0 1px 3px rgba(0, 0, 0, 0.06); --fclk-toast-bg: #ffffff; - margin: -16px -15px; + margin: 0; padding: 0; min-height: 100vh; background: var(--fclk-bg); @@ -104,6 +104,24 @@ body:has(.fclk-app.fclk-dark) { background: #0f1117; } +/* Neutralise the portal layout wrappers so the dark app fills edge-to-edge. + The portal wraps content in #wrapwrap > main > #wrap.o_portal_wrap > + .container, whose Bootstrap max-width (centred) + "pt-3 pb-5" padding is + what showed as a white frame on wider screens. */ +body:has(.fclk-app) #wrapwrap, +body:has(.fclk-app) main, +body:has(.fclk-app) #wrap.o_portal_wrap { + background: transparent !important; + padding: 0 !important; + margin: 0 !important; +} +body:has(.fclk-app) #wrap.o_portal_wrap > .container, +body:has(.fclk-app) main > .container { + max-width: 100% !important; + padding: 0 !important; + margin: 0 !important; +} + .fclk-container { max-width: 480px; margin: 0 auto; diff --git a/fusion_planning/__manifest__.py b/fusion_planning/__manifest__.py index 0ec8c6d6..c9c36f1d 100644 --- a/fusion_planning/__manifest__.py +++ b/fusion_planning/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Planning', - 'version': '19.0.1.2.0', + 'version': '19.0.1.3.0', 'category': 'Human Resources/Planning', 'summary': 'Fusion Clock bridge to Odoo Planning - employee schedule on the portal', 'description': """ diff --git a/fusion_planning/controllers/portal_schedule.py b/fusion_planning/controllers/portal_schedule.py index 84c98eba..2f257414 100644 --- a/fusion_planning/controllers/portal_schedule.py +++ b/fusion_planning/controllers/portal_schedule.py @@ -93,5 +93,8 @@ class FusionPlanningPortal(http.Controller): 'slot_count': len(slots), 'next_slot': next_slot_data, 'page_name': 'fusion_clock_schedule', + # Match the other portal pages so the Payslips nav tab appears + # consistently when payroll is installed. + 'show_payslips': 'hr.payslip' in request.env, } return request.render('fusion_planning.portal_schedule_page', values) diff --git a/fusion_planning/views/portal_schedule_templates.xml b/fusion_planning/views/portal_schedule_templates.xml index da23efed..8d155b25 100644 --- a/fusion_planning/views/portal_schedule_templates.xml +++ b/fusion_planning/views/portal_schedule_templates.xml @@ -155,6 +155,15 @@ Reports + + + + + + + Payslips + +