From 2b9230c3263ecabb3b4c8c2e88bbf207eed6d2b8 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 25 Mar 2021 11:22:36 -0600
Subject: [PATCH] Calendar: Move searchbox into "toolbar", change it into
 proper searchbox, hide it in nextmatch header

---
 calendar/inc/class.calendar_uiviews.inc.php |  8 --------
 calendar/templates/default/app.css          | 16 ++++++++++++++--
 calendar/templates/default/toolbar.xet      |  7 ++++++-
 calendar/templates/pixelegg/app.css         | 15 +++++++++++++--
 calendar/templates/pixelegg/app.less        |  1 +
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 3678e5739d..9bdbd09734 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -259,14 +259,6 @@ class calendar_uiviews extends calendar_ui
 	{
 		$group = 0;
 		$actions = array(
-			'add' => array(
-				'caption' => 'Add',
-				'icon'	=> 'add',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.calendar.toolbar_action',
-				'hint' => 'Add',
-				'toolbarDefault' => true,
-			),
 			'day_view' => array(
 				'caption' => 'Dayview',
 				'icon'	=> '1_day_view',
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 8f9ea49800..f08bef01af 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -173,8 +173,11 @@ div.calendar_conflicts {
 #calendar-toolbar {
 	height: 30px;
 }
-#calendar-toolbar button#toolbar-add {
-	margin-right: -3px;
+#calendar-toolbar > div {
+	display: flex;
+}
+#calendar-toolbar .et2_toolbar {
+	background: inherit;
 }
 #calendar-toolbar .egw_fw_ui_app_header_container {
 	border: none;
@@ -184,11 +187,16 @@ div.calendar_conflicts {
 	justify-content: flex-end;
 }
 #calendar-toolbar #calendar-toolbar_keywords {
+	margin-right: 4px;
+}
+#calendar-toolbar .et2_searchbox input {
 	height: 14px;
 }
 #calendar-toolbar #calendar-toolbar_favorite_wrapper {
 	float: right;
+	white-space: nowrap;
 	margin-right: 5px;
+	margin-top: -4px;
 }
 #calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
 	z-index: 40;
@@ -1615,3 +1623,7 @@ img.calendar_print_button, img.calendar_print_appicon {
 #toolbar-weekend {background-image: none !important; filter:none;}
 
 #calendar-list_nm .nextmatch_header .header_count {margin-right:-4px;}
+
+#calendar-list_nm .nextmatch_header .search {
+	display: none;
+}
\ No newline at end of file
diff --git a/calendar/templates/default/toolbar.xet b/calendar/templates/default/toolbar.xet
index 4501084c46..5d06545d14 100644
--- a/calendar/templates/default/toolbar.xet
+++ b/calendar/templates/default/toolbar.xet
@@ -13,11 +13,16 @@ Egroupware
 
 <overlay>
 	<template id="calendar.toolbar">
+		<box class="et2_toolbar">
+			<box class="et2_toolbar_actionlist">
+				<buttononly id="add" background_image="true" image="add" onclick="app.calendar.toolbar_action(widget);"/>
+			</box>
+		</box>
+		<searchbox id="keywords" blur="Search" overlay="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;"/>
 		<toolbar id="toolbar" width="100%" flat_list="false"/>
 		<!-- Fake an app header inside the toolbar -->
 		<box class="egw_fw_ui_app_header_container">
 			<description id="app_header"/>
-			<textbox id="keywords" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
 			<favorites app="calendar"/>
 		</box>
 	</template>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 04b6f28eec..fa731a25e6 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -180,8 +180,11 @@ div.calendar_conflicts {
 #calendar-toolbar {
   height: 30px;
 }
-#calendar-toolbar button#toolbar-add {
-  margin-right: -3px;
+#calendar-toolbar > div {
+  display: flex;
+}
+#calendar-toolbar .et2_toolbar {
+  background: inherit;
 }
 #calendar-toolbar .egw_fw_ui_app_header_container {
   border: none;
@@ -191,11 +194,16 @@ div.calendar_conflicts {
   justify-content: flex-end;
 }
 #calendar-toolbar #calendar-toolbar_keywords {
+  margin-right: 4px;
+}
+#calendar-toolbar .et2_searchbox input {
   height: 14px;
 }
 #calendar-toolbar #calendar-toolbar_favorite_wrapper {
   float: right;
+  white-space: nowrap;
   margin-right: 5px;
+  margin-top: -4px;
 }
 #calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
   z-index: 40;
@@ -1582,6 +1590,9 @@ img.calendar_print_appicon {
 #calendar-list_nm .nextmatch_header .header_count {
   margin-right: -4px;
 }
+#calendar-list_nm .nextmatch_header .search {
+  display: none;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 2676f74991..be6ecb99b7 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -16,6 +16,7 @@
 @import (less) "../default/app.css";
 
 
+
 /*generell*/
 
 // makes svg visible