From 99ceb6e158e5dc0f8683294c03abcba7866b30a2 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 18 Sep 2024 18:44:52 -0600
Subject: [PATCH] Align SEARCH and other buttons to the right

---
 app/xml_cdr/app_languages.php | 7 ++++---
 app/xml_cdr/xml_cdr.php       | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index 50ed0d78f5..382c2d954a 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -3510,8 +3510,8 @@ $text['label-call_center_queue']['zh-cn'] = "呼叫中心队列";
 $text['label-call_center_queue']['ja-jp'] = "コールセンターのキュー";
 $text['label-call_center_queue']['ko-kr'] = "콜센터 대기열";
 
-$text['description_search']['en-us'] = "<u>Note</u>: Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
-$text['description_search']['en-gb'] = "<u>Note</u>: Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
+$text['description_search']['en-us'] = "Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
+$text['description_search']['en-gb'] = "Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
 $text['description_search']['ar-eg'] = "يدعم حقلا الوجهة واسم تعريف المتصل استخدام علامة النجمة كحرف بدل.";
 $text['description_search']['de-at'] = "Info: Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen.";
 $text['description_search']['de-ch'] = "Info: Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen.";
@@ -3522,7 +3522,7 @@ $text['description_search']['es-mx'] = "<u>Atención</u>: Destino y el identific
 $text['description_search']['fr-ca'] = "<u>Attention</u>: Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique.";
 $text['description_search']['fr-fr'] = "<u>Attention</u>: Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique.";
 $text['description_search']['he-il'] = "השדות 'יעד' ו'שם זיהוי מתקשר' תומכים בשימוש בכוכבית כתו כללי.";
-$text['description_search']['it-it'] = "<u>Nota</u>: Destinazione e ID Nome Chiamante (CID) supportano l'uso di un <i>asterisco</i> ('*') come carattere jolly.";
+$text['description_search']['it-it'] = "Destinazione e ID Nome Chiamante (CID) supportano l'uso di un <i>asterisco</i> ('*') come carattere jolly.";
 $text['description_search']['ka-ge'] = "<u>შენიშვნა</u>: სამიზნე და დამრეკის ID (CID) სახელის ველებს აქვთ <i>ვარსკვლავის</i> ('*') მხარდაჭერა ვაილდქარდის სიმბოლოდ.";
 $text['description_search']['nl-nl'] = "De velden Destination en Caller Identification Name ondersteunen het gebruik van een sterretje als jokerteken.";
 $text['description_search']['pl-pl'] = "Uwaga: Następujące pola: numer dzwoniącego i odbiorcy rozmowy, prezentacja numeru oraz nazwy wspierają gwiazdkę (‘*’) jako symbol wieloznaczny.";
@@ -3993,3 +3993,4 @@ $text['label-text']['ja-jp'] = "文章";
 $text['label-text']['ko-kr'] = "텍스트";
 
 ?>
+
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index dac06b2732..114bf560c8 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -307,14 +307,14 @@
 		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
 	}
 
-	echo $text['description']." \n";
+	echo $text['description']." &nbsp; ".$text['description_search']."\n";
 	echo "<br /><br />\n";
 
 //basic search of call detail records
 	if ($permission['xml_cdr_search']) {
 		echo "<form name='frm' id='frm' method='get'>\n";
 
-		echo "<div class='card'>\n";
+		echo "<div class='card' style=''>\n";
 		echo "<div class='form_grid'>\n";
 
 		if ($permission['xml_cdr_search_direction']) {
@@ -608,7 +608,7 @@
 		echo "</div>\n";
 
 		button::$collapse = false;
-		echo "<div style='float: right; padding-top: 15px; margin-left: 20px; white-space: nowrap;'>";
+		echo "<div style='display: flex; justify-content: flex-end; padding-top: 15px; margin-left: 20px; white-space: nowrap;'>";
 		if ($permission['xml_cdr_all'] && $_REQUEST['show'] == 'all') {
 			echo "<input type='hidden' name='show' value='all'>\n";
 		}
@@ -619,8 +619,7 @@
 		echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_save','name'=>'submit']);
 		echo "</div>\n";
 		echo "</div>\n";
-		echo "<div style='font-size: 85%; padding-top: 12px; margin-bottom: 40px;'>".$text['description_search']."</div>\n";
-
+		echo "<br />\n";
 		echo "</form>";
 	}