From 96e8cc1a371c69cd8b9ffb7ff1367d9980f510b7 Mon Sep 17 00:00:00 2001
From: hadi <hnategh@gmail.com>
Date: Tue, 16 May 2023 12:09:48 +0200
Subject: [PATCH] * Mobile theme: Fix calendar header toolbars are no more
 visible

---
 calendar/inc/class.calendar_uiviews.inc.php |  2 +-
 calendar/templates/mobile/app.css           | 12 +++++++++---
 calendar/templates/mobile/app.less          |  9 ++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 700baf9bcf..3c19767669 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -422,7 +422,7 @@ class calendar_uiviews extends calendar_ui
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('next', 'today','previous'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 				else {
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 02ea059889..da83682f5b 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -1035,6 +1035,7 @@ Hide subsequent headers in week view with non-consolidated owners
 }
 .calendar_calDayTodosTable tr {
   page-break-inside: avoid;
+  display: flex;
 }
 .calendar_calDayTodosTable tr td span:first-child {
   white-space: nowrap;
@@ -2709,7 +2710,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
     z-index: 1;
   }
   #calendar-toolbar #toolbar-actionlist {
-    margin-left: 60px;
     margin-top: 4px;
   }
   #calendar-edit #calendar-edit_calendar-edit-details {
@@ -2804,6 +2804,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   #calendar-toolbar .nm-mob-header {
     width: 100%;
     position: absolute;
+    display: inline-block;
     z-index: 100;
   }
   #calendar-toolbar .nm-mob-header .ui-toolbar-menulist button {
@@ -2814,12 +2815,17 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
     width: 50px;
   }
   #calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar {
-    width: calc(100% - 100px);
-    display: inline-block;
+    display: flex;
     padding: 0px !important;
+    min-width: 230px;
+    justify-content: flex-start;
   }
   #calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar #toolbar-actionlist {
     margin-left: 0px;
+    margin-top: 0px;
+  }
+  #calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar .et2_toolbar_more {
+    min-width: 30px;
   }
   span#calendar-view_header_dateIndicator {
     display: block;
diff --git a/calendar/templates/mobile/app.less b/calendar/templates/mobile/app.less
index 066d5e44f7..50f3be766d 100644
--- a/calendar/templates/mobile/app.less
+++ b/calendar/templates/mobile/app.less
@@ -21,7 +21,6 @@
 		background: #0c5da5;
 		z-index: 1;
 		#toolbar-actionlist {
-			margin-left: 60px;
 			margin-top: 4px;
 		}
 	}
@@ -103,6 +102,7 @@
 		.nm-mob-header {
 			width: 100%;
 			position: absolute;
+			display: inline-block;
 			.ui-toolbar-menulist button {color: black;}
 			z-index: 100;
 			.et2_searchbox {
@@ -110,12 +110,15 @@
 				width: 50px;
 			}
 			#calendar-toolbar_toolbar{
-				width: ~"calc(100% - 100px)";
-				display: inline-block;
+				display: flex;
 				padding: 0px !important;
+				min-width: 230px;
+				justify-content: flex-start;
 				#toolbar-actionlist {
 					margin-left: 0px;
+					margin-top: 0px;
 				}
+				.et2_toolbar_more {min-width: 30px;}
 			}
 		}
 	}