From 78b2824c131fe592180e10973de13a26555f75ca Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Thu, 20 May 2021 15:38:31 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03914=20Harmonize=20advanced=20search's?=
 =?UTF-8?q?=20external=20key=20search=20buttons=20style=20and=20positions?=
 =?UTF-8?q?=20on=20modals=20and=20fix=20add=20button=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui.searchformforeignkeys.class.inc.php    | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 19acbdd82..703781654 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -64,16 +64,42 @@ class UISearchFormForeignKeys
         <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
     </div>
     <input type="hidden" id="count_{$this->m_iInputId}" value="0"/>
-    <input type="button" value="{$sCancel}" onClick="$('#dlg_{$this->m_iInputId}').dialog('close');">&nbsp;&nbsp;
-    <input id="btn_ok_add_{$this->m_iInputId}" disabled="disabled" type="button" onclick="return oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);" value="{$sAdd}">
 </form>
 HTML
 		);
 
-		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
+		$oPage->add_ready_script(
+			<<<JS
+ $('#dlg_{$this->m_iInputId}').dialog({ 
+ 			width: $(window).width()*0.8, 
+ 			height: $(window).height()*0.8, 
+ 			autoOpen: false, 
+ 			modal: true, 
+ 			resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes,
+            buttons: [
+				{
+					text: Dict.S('UI:Button:Cancel'),
+					class: "cancel ibo-is-alternative ibo-is-neutral",
+					click: function() {
+						$('#dlg_{$this->m_iInputId}').dialog('close');
+					}
+				},
+				{
+					text:  Dict.S('UI:Button:Add'),
+					id: 'btn_ok_{$this->m_iInputId}',
+					class: "ok ibo-is-regular ibo-is-primary",
+					click: function() {
+						oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);							
+					}
+				},
+			],
+
+ });
+$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
+$('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
+$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
+JS
+);
 	}
 
 	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)