Et2Date: Add "Ok" button to close calendar popup

api/js/etemplate/Et2Date/Et2Date.ts

@@ -431,11 +431,15 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(ValidateMixin(LitFl
 		options.plugins = [
 			// Turn on scroll wheel support
 			// @ts-ignore TypeScript can't find scrollPlugin, but rollup does
-			new scrollPlugin(),
-
-			// Add "today" button
-			this._buttonPlugin()
+			new scrollPlugin()
 		];
+		// Add "Ok" and "today" buttons
+		const buttons = this._buttonPlugin();
+		if(buttons)
+		{
+			options.plugins.push(buttons)
+		}
+
 
 		// Listen for flatpickr change so we can update internal value, needed for validation
 		options.onChange = options.onReady = this._updateValueOnChange;
@@ -457,7 +461,14 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(ValidateMixin(LitFl
 	 */
 	public _handleShortcutButtonClick(button_index, fp)
 	{
-		fp.setDate(new Date());
+		switch(button_index)
+		{
+			case 0: // OK
+				fp.close();
+				break;
+			default:
+				fp.setDate(new Date());
+		}
 	}
 
 	/**
@@ -482,7 +493,10 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(ValidateMixin(LitFl
 	{
 		// @ts-ignore TypeScript can't find ShortcutButtonsPlugin, but rollup does
 		return ShortcutButtonsPlugin({
-			button: [{label: this.egw().lang("Today")}],
+			button: [
+				{label: this.egw().lang("ok")},
+				{label: this.egw().lang("Today")}
+			],
 			onClick: this._handleShortcutButtonClick
 		})
 	}

api/js/etemplate/Et2Date/Et2DateTime.ts

@@ -102,7 +102,10 @@ export class Et2DateTime extends Et2Date
 	{
 		// @ts-ignore TypeScript can't find ShortcutButtonsPlugin, but rollup does
 		return ShortcutButtonsPlugin({
-			button: [{label: this.egw().lang("Now")}],
+			button: [
+				{label: this.egw().lang("ok")},
+				{label: this.egw().lang("Now")}
+			],
 			onClick: this._handleShortcutButtonClick
 		})
 	}

api/templates/default/etemplate2.css

@@ -4107,6 +4107,11 @@ div.flatpickr-calendar.inline .flatpickr-day:not(.today) {
     border: none;
 }
 
+/* put bottom buttons in a row */
+div.flatpickr-calendar .shortcut-buttons-flatpickr-buttons {
+    display: flex;
+}
+
 button.shortcut-buttons-flatpickr-button:hover {
     background-color: #eceef1;
 }

calendar/js/SidemenuDate.ts

@@ -105,6 +105,12 @@ export class SidemenuDate extends Et2Date
 		return options
 	}
 
+	protected _buttonPlugin()
+	{
+		// No buttons
+		return null;
+	}
+
 	set_value(value)
 	{
 		if(typeof value !== "string" && value.length == 8)