From 4f8b54ba1f3bf8e6bf6169da16fa24c78c762fe8 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Thu, 8 Jun 2023 20:36:40 -0400
Subject: [PATCH] SearchKit - Tidy up admin buttons

---
 .../crmSearchAdmin/searchListing/buttons.html  | 18 ++++++++++++------
 .../ang/crmSearchDisplay/colType/menu.html     |  4 ++--
 ext/search_kit/css/crmSearchAdmin.css          |  4 ++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html b/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
index bcc11e87bc..90128ecac3 100644
--- a/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
+++ b/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
@@ -1,12 +1,18 @@
-<div class="btn-group btn-group-xs">
-  <a class="btn btn-primary" ng-href="#/edit/{{:: row.data.id }}" ng-if=":: row.permissionToEdit">
-    <i class="crm-i fa-pencil"></i>
-    {{:: ts('Edit') }}
+<div class="btn-group btn-group-xs crm-search-admin-search-listing-buttons">
+  <a class="btn btn-primary" ng-href="#/edit/{{:: row.data.id }}" ng-if=":: row.permissionToEdit" title="{{:: ts('Edit search and displays') }}">
+    <i class="crm-i fa-pencil fa-fw"></i>
   </a>
   <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="row.menuOpen = true">
     <i class="crm-i fa-bars"></i>
+    <span class="caret"></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-right" ng-if=":: row.menuOpen">
+    <li ng-if=":: row.permissionToEdit" title="{{:: ts('Edit search and displays') }}">
+      <a ng-href="#/edit/{{:: row.data.id }}">
+        <i class="crm-i fa-pencil fa-fw"></i>
+        {{:: ts('Edit') }}
+      </a>
+    </li>
     <li title="{{:: ts('View search results table') }}">
       <a ng-href="{{:: $ctrl.searchDisplayPath + '#/display/' + row.data.name }}" target="_blank">
         <i class="crm-i fa-table"></i>
@@ -28,13 +34,13 @@
     <li ng-if="!row.data['base_module:label']" title="{{:: ts('Delete search along with any displays and forms') }}">
       <a href ng-click="$ctrl.deleteOrRevert(row)">
         <i class="crm-i fa-trash"></i>
-        {{:: ts('Delete...') }}
+        {{:: ts('Delete') }}
       </a>
     </li>
     <li ng-if="row.data['base_module:label'] && row.data['local_modified_date']" title="{{:: ts('Revert search to its packaged state') }}">
       <a href ng-click="$ctrl.deleteOrRevert(row)">
         <i class="crm-i fa-undo"></i>
-        {{:: ts('Revert...') }}
+        {{:: ts('Revert') }}
       </a>
     </li>
   </ul>
diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/menu.html b/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
index cef1a83bbb..338c2a37fc 100644
--- a/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
+++ b/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
@@ -1,5 +1,5 @@
-<div class="btn-group">
-  <button type="button" class="dropdown-toggle {{:: $ctrl.settings.columns[colIndex].size }} btn-{{:: $ctrl.settings.columns[colIndex].style }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="colData.open = true">
+<div class="btn-group" role="group">
+  <button type="button" class="dropdown-toggle btn {{:: $ctrl.settings.columns[colIndex].size }} btn-{{:: $ctrl.settings.columns[colIndex].style }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="colData.open = true">
     <i ng-if=":: $ctrl.settings.columns[colIndex].icon" class="crm-i {{:: $ctrl.settings.columns[colIndex].icon }}"></i>
     {{:: colData.text }}
     <span class="caret"></span>
diff --git a/ext/search_kit/css/crmSearchAdmin.css b/ext/search_kit/css/crmSearchAdmin.css
index 89c5391b74..ce61e5e821 100644
--- a/ext/search_kit/css/crmSearchAdmin.css
+++ b/ext/search_kit/css/crmSearchAdmin.css
@@ -11,6 +11,10 @@
   top: 0;
 }
 
+#bootstrap-theme .crm-search-admin-search-listing-buttons {
+  min-width: 65px;
+}
+
 #bootstrap-theme.crm-search .nav-stacked {
   margin-left: 0;
   margin-right: 20px;
-- 
2.25.1