From 2309fda2d74fcc0d110b80fe66e0abb9ef6a67b3 Mon Sep 17 00:00:00 2001
From: "Michael (mcm)" <mcm@odoo.com>
Date: Thu, 2 Feb 2023 09:16:13 +0000
Subject: [PATCH] [IMP] web: move calendar filter panel to left

This commit moves the filter panel of the calendar view
to the left of the view to make it more coherent with
other views.

closes odoo/odoo#111666

Task: 3164391
Related: odoo/enterprise#36606
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../src/views/calendar/calendar_controller.scss    |  2 +-
 .../src/views/calendar/calendar_controller.xml     |  2 +-
 .../src/views/calendar/calendar_renderer.scss      | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/views/calendar/calendar_controller.scss b/addons/web/static/src/views/calendar/calendar_controller.scss
index 82f8ed3c6cb..be2d006784e 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.scss
+++ b/addons/web/static/src/views/calendar/calendar_controller.scss
@@ -22,7 +22,7 @@ $o-cw-filter-avatar-size: 20px;
     position: relative;
     @include o-webclient-padding($top: $o-horizontal-padding/2);
     background-color: $o-view-background-color;
-    border-left: 1px solid $border-color;
+    border-right: 1px solid $border-color;
     overflow-y: auto;
 
     .o_calendar_sidebar {
diff --git a/addons/web/static/src/views/calendar/calendar_controller.xml b/addons/web/static/src/views/calendar/calendar_controller.xml
index 1951bbd156b..a08bc12f2d5 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.xml
+++ b/addons/web/static/src/views/calendar/calendar_controller.xml
@@ -10,13 +10,13 @@
 
                 <div class="o_calendar_container">
                     <MobileFilterPanel t-if="env.isSmall" t-props="mobileFilterPanelProps" />
-                    <t t-if="showCalendar" t-component="props.Renderer" t-props="rendererProps" />
                     <div t-if="showSideBar" class="o_calendar_sidebar_container d-md-block">
                         <div class="o_calendar_sidebar">
                             <DatePicker t-if="!env.isSmall" t-props="datePickerProps" />
                             <FilterPanel t-props="filterPanelProps" />
                         </div>
                     </div>
+                    <t t-if="showCalendar" t-component="props.Renderer" t-props="rendererProps" />
                 </div>
             </Layout>
         </div>
diff --git a/addons/web/static/src/views/calendar/calendar_renderer.scss b/addons/web/static/src/views/calendar/calendar_renderer.scss
index cc689a53d45..3301bf2c5b7 100644
--- a/addons/web/static/src/views/calendar/calendar_renderer.scss
+++ b/addons/web/static/src/views/calendar/calendar_renderer.scss
@@ -123,7 +123,7 @@
         .fc-timeGridDay-view,
         .fc-timeGridWeek-view {
             .fc-axis {
-                padding-left: $o-horizontal-padding;
+                padding-right: $o-horizontal-padding;
             }
 
             .fc-widget-header.fc-today {
@@ -240,10 +240,6 @@
 
         // ====== Week only
         .fc-timeGridWeek-view {
-            .fc-now-indicator {
-                left: $o-horizontal-padding;
-            }
-
             // Expand tiny events on hover/select
             .fc-event:not(.fc-h-event).o_cw_custom_highlight {
                 transition: margin 0.1s 0.3s, left 0.1s 0.3s, right 0.1s 0.3s;
@@ -255,7 +251,8 @@
 
         // ====== Month only
         .fc-dayGridMonth-view {
-            padding-left: $o-horizontal-padding;
+            margin-right: $o-horizontal-padding;
+            border-right: 1px solid $border-color;
 
             .fc-event {
                 border-radius: 25px;
@@ -370,7 +367,7 @@
         .fc-dayGridYear-view {
             border: none;
             height: 100%;
-            padding-left: $o-horizontal-padding;
+            padding-right: $o-horizontal-padding;
             box-sizing: border-box;
             display: flex;
             flex-wrap: wrap;
@@ -444,7 +441,8 @@
                     }
 
                     .fc-dayGridMonth-view {
-                        padding-left: unset;
+                        margin-right: none;
+                        border-right: none;
 
                         .fc-has-event {
                             background-color: #b4dff5;