From 25004e538a18fe565e43380d5cdd2e67ab714610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=B8=D0=BD?= <igor_26reg@mail.ru>
Date: Fri, 5 Dec 2025 16:59:23 +0300
Subject: [PATCH] feat: move calendar button from FAB to navbar

- Removed floating action button (FAB) for calendar
- Added calendar icon in navbar next to notification bell
- Calendar button only visible on mobile devices (d-lg-none)
- Fixed issue where FAB could overlap message send button
- Commented out calendar-fab CSS in all relevant files
---
 backend/static/css/components/base-app.css          |  7 ++++---
 .../components/rightbar-calendar-fullcalendar.css   |  6 ++++--
 backend/static/css/components/rightbar-calendar.css |  6 ++++--
 .../includes/components/calendar_mobile.html        |  8 +-------
 backend/templates/includes/navbar.html              | 13 +++++++++++++
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/backend/static/css/components/base-app.css b/backend/static/css/components/base-app.css
index 371feb47..f82277f4 100644
--- a/backend/static/css/components/base-app.css
+++ b/backend/static/css/components/base-app.css
@@ -214,9 +214,9 @@ body {
 }
 
 /* ─────────────────────────────────────────────────────────────
-   MOBILE FAB
+   MOBILE FAB (REMOVED - now using navbar button)
 ────────────────────────────────────────────────────────────── */
-.calendar-fab {
+/* .calendar-fab {
   position: fixed;
   right: 1rem;
   bottom: 1rem;
@@ -225,7 +225,8 @@ body {
   height: 52px;
   border-radius: 9999px;
   box-shadow: 0 8px 24px rgba(0, 0, 0, .18);
-}
+} */
+
 
 /* ─────────────────────────────────────────────────────────────
    BUTTONS & GHOST BUTTONS
diff --git a/backend/static/css/components/rightbar-calendar-fullcalendar.css b/backend/static/css/components/rightbar-calendar-fullcalendar.css
index f55d3ca3..922446cf 100644
--- a/backend/static/css/components/rightbar-calendar-fullcalendar.css
+++ b/backend/static/css/components/rightbar-calendar-fullcalendar.css
@@ -273,7 +273,8 @@
   flex: 0 0 auto;
 }
 
-.calendar-fab {
+/* Calendar FAB removed - now using navbar button */
+/* .calendar-fab {
   position: fixed;
   right: 1rem;
   bottom: 1rem;
@@ -282,7 +283,8 @@
   height: 52px;
   border-radius: 9999px;
   box-shadow: 0 8px 24px rgba(0,0,0,.18);
-}
+} */
+
 
 /* ─────────────────────────────────────────────────────────────
    COLOR PICKER (PALETTE)
diff --git a/backend/static/css/components/rightbar-calendar.css b/backend/static/css/components/rightbar-calendar.css
index 8ecb92b7..5107f420 100644
--- a/backend/static/css/components/rightbar-calendar.css
+++ b/backend/static/css/components/rightbar-calendar.css
@@ -276,7 +276,8 @@
   flex: 0 0 auto; 
 }
 
-.calendar-fab{ 
+/* Calendar FAB removed - now using navbar button */
+/* .calendar-fab{ 
   position: fixed; 
   right: 1rem; 
   bottom: 1rem; 
@@ -285,7 +286,8 @@
   height: 52px; 
   border-radius: 9999px; 
   box-shadow: 0 8px 24px rgba(0,0,0,.18); 
-}
+} */
+
 
 /* ====== Color picker (palette) ====== */
 .color-swatch{
diff --git a/backend/templates/includes/components/calendar_mobile.html b/backend/templates/includes/components/calendar_mobile.html
index 8d4acabd..d2454ef9 100644
--- a/backend/templates/includes/components/calendar_mobile.html
+++ b/backend/templates/includes/components/calendar_mobile.html
@@ -1,10 +1,4 @@
-{# Мобильная версия календаря - offcanvas + плавающая кнопка #}
-<button class="btn btn-primary calendar-fab d-lg-none" type="button"
-        data-bs-toggle="offcanvas" data-bs-target="#rightbarOffcanvas"
-        aria-controls="rightbarOffcanvas" aria-label="Календарь">
-  <i class="bi-calendar-event"></i>
-</button>
-
+{# Мобильная версия календаря - offcanvas без плавающей кнопки #}
 <div class="offcanvas offcanvas-end d-lg-none" id="rightbarOffcanvas" tabindex="-1"
      data-bs-scroll="true" data-dept-id="{{ dept_ids|default:'' }}"
      style="--bs-offcanvas-width: min(92vw, 420px);">
diff --git a/backend/templates/includes/navbar.html b/backend/templates/includes/navbar.html
index 2910b6f5..f60dd356 100644
--- a/backend/templates/includes/navbar.html
+++ b/backend/templates/includes/navbar.html
@@ -67,6 +67,19 @@
           </button>
         </div>
 
+        <!-- Календарь: только на мобильных устройствах -->
+        <div class="position-relative navbar-icon d-lg-none">
+          <button class="btn btn-link text-white p-0" 
+                  type="button"
+                  data-bs-toggle="offcanvas" 
+                  data-bs-target="#rightbarOffcanvas"
+                  aria-controls="rightbarOffcanvas"
+                  title="Календарь" 
+                  aria-label="Календарь">
+            <i class="bi-calendar-event fs-5"></i>
+          </button>
+        </div>
+
       </div>
     {% endif %}