From 0a3e6503acb3f95a0b5f77c80020fb327661a28b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 15 Sep 2022 16:06:10 +0200
Subject: [PATCH] Get vacation notice shown again

---
 mail/js/app.js                   |  2 ++
 mail/templates/default/app.css   | 12 +++++++++++-
 mail/templates/default/index.xet | 11 +++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index cb9460f85b..5f162aacf1 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1543,11 +1543,13 @@ app.classes.mail = AppJS.extend(
 		if (!this.et2 && !this.checkET2()) return;
 		if (_data == null)
 		{
+			this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(true);
 			this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value('');
 			this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value('');
 		}
 		else
 		{
+			this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(false);
 			this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value(_data.vacationnotice);
 			this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value(_data.vacationrange);
 		}
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 66111e9a57..2e6a9c8ade 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -1046,4 +1046,14 @@ div#mail-index_nm.splitter-pane {min-height: 100px;}
 	border: none;
 }
 #popupMainDiv {height: 100%}
-.treeContainer {height: calc(100% - 100px)}
\ No newline at end of file
+.treeContainer {height: calc(100% - 100px)}
+#mail-index_mail-index-header_right {gap: 1ex;}
+#mail-index_mail-index-header_right et2-details.vacationnotice {
+	min-width: 8em;
+}
+#mail-index_mail-index-header_right et2-details.vacationnotice::part(base) {
+	background: #dee9f3;
+	border-color: #0f65968f;
+	border-width: 1px;
+	height: 2.6em;
+}
\ No newline at end of file
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index e865156ebb..48d9cb2c04 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -125,12 +125,11 @@
         <buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" image="add"/>
     </template>
     <template id="mail.index.header_right" template="" lang="" group="0" version="1.9.001">
-        <hbox id="mail.index.vacationnotice" class="mail-index_vacation">
-            <vbox>
-                <description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
-                <description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/>
-            </vbox>
-        </hbox>
+        <et2-details id="mail.index.vacationnotice" summary="on vacation" toggleOnHover="true" hoist="true" class="vacationnotice">
+            <description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
+            <description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/>
+        </et2-details>
+
         <hbox id="mail.index.datefilter" class="mail-index_datefilter">
             <date id="startdate" label="Start" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>
             <date id="enddate" label="End" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>