From 369bddef2ff6c1b2e6a88a5010d67b2df4a5068d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 21 Feb 2023 13:39:50 +0100
Subject: [PATCH] Adopt header's buttons in mobile templates

---
 admin/templates/mobile/mailaccount.xet | 8 ++++----
 calendar/templates/mobile/edit.xet     | 6 +++---
 filemanager/templates/mobile/file.xet  | 4 ++--
 package-lock.json                      | 6 ++----
 resources/templates/mobile/edit.xet    | 4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/admin/templates/mobile/mailaccount.xet b/admin/templates/mobile/mailaccount.xet
index ad111cd585..2d03835ec5 100644
--- a/admin/templates/mobile/mailaccount.xet
+++ b/admin/templates/mobile/mailaccount.xet
@@ -299,11 +299,11 @@
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
 					<et2-hbox  span="all">
-						<et2-button  id="button[save]"></et2-button>
-						<et2-button  id="button[apply]"></et2-button>
+						<et2-button-icon  id="button[save]"></et2-button-icon>
+						<et2-button-icon  id="button[apply]"></et2-button-icon>
 						<et2-button-icon  statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"></et2-button-icon>
-						<et2-button  id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"></et2-button>
-						<et2-button  label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete"></et2-button>
+						<et2-button-icon  id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"></et2-button-icon>
+						<et2-button-icon  label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete"></et2-button-icon>
 					</et2-hbox>
 				</row>
 				<row disabled="!@accounts" class="dialogHeader">
diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet
index a62cc3073d..2bed401b6e 100644
--- a/calendar/templates/mobile/edit.xet
+++ b/calendar/templates/mobile/edit.xet
@@ -193,9 +193,9 @@
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
 					<et2-hbox  span="all" width="100%">
-						<et2-button  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button>
-						<et2-button  statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button>
-						<et2-button  statustext="Find free timeslots where the selected participants are available for the given timespan" id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="add" noSubmit="true"></et2-button>
+						<et2-button-icon  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
+						<et2-button-icon  statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button-icon>
+						<et2-button-icon  statustext="Find free timeslots where the selected participants are available for the given timespan" id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="add" noSubmit="true"></et2-button-icon>
 						<et2-checkbox  id="no_notifications" class="notification_check" toggleOn=" " toggleOff=" "></et2-checkbox>
 						<et2-textbox  type="hidden" id="delete_exceptions"></et2-textbox>
 					</et2-hbox>
diff --git a/filemanager/templates/mobile/file.xet b/filemanager/templates/mobile/file.xet
index 8576c4a6bc..1f6f646afe 100644
--- a/filemanager/templates/mobile/file.xet
+++ b/filemanager/templates/mobile/file.xet
@@ -185,8 +185,8 @@
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
 					<et2-hbox  span="all" width="100%">
-						<et2-button  statustext="Saves this entry" id="button[save]" image="save"></et2-button>
-						<et2-button  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button>
+						<et2-button-icon  statustext="Saves this entry" id="button[save]" image="save"></et2-button-icon>
+						<et2-button-icon  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
 					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
diff --git a/package-lock.json b/package-lock.json
index 5fa4f96fe7..ce1e8b18bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6739,8 +6739,7 @@
       "version": "1.10.11",
       "resolved": "https://registry.npmjs.org/@interactjs/core/-/core-1.10.11.tgz",
       "integrity": "sha512-aJ50ccVeszpJt7wPH7Yfqm7f1aG1SA94qd90P0NaESh5/QUXn4CESO6igobo4DFHQ5z+1Rfdl8aphP4JxlH4gw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@interactjs/dev-tools": {
       "version": "1.10.11",
@@ -11177,8 +11176,7 @@
       "version": "7.5.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
       "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "yallist": {
       "version": "4.0.0",
diff --git a/resources/templates/mobile/edit.xet b/resources/templates/mobile/edit.xet
index aa9db7aa29..44d5e0b5fb 100644
--- a/resources/templates/mobile/edit.xet
+++ b/resources/templates/mobile/edit.xet
@@ -135,8 +135,8 @@
 			<rows>
 				<row  class="dialogHeadbar" >
 					<et2-hbox>
-						<et2-button  id="button[apply]" image="apply"></et2-button>
-						<et2-button  id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button>
+						<et2-button-icon  id="button[apply]" image="apply"></et2-button-icon>
+						<et2-button-icon  id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button-icon>
 						<et2-number  id="res_id" readonly="true" class="entry_id" precision="0"></et2-number>
 					</et2-hbox>
 				</row>