From a25409ea36656db8ffa815fce9776dc177434105 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 5 Oct 2021 10:33:12 -0400
Subject: [PATCH 1/2] SearchKit - tweak button styles for shorditch

---
 ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTags.html | 2 +-
 ext/search_kit/ang/crmSearchAdmin/tabs.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTags.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTags.html
index 342ec12d389e..31711443dc46 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTags.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTags.html
@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-secondary dropdown-toggle" ng-click="$ctrl.openMenu()" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<button type="button" class="btn btn-secondary-outline dropdown-toggle" ng-click="$ctrl.openMenu()" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
   <i class="crm-i fa-tag"></i>
   <span class="crm-search-admin-tags-btn-label">{{:: ts('Tags') }}</span>
   <span class="caret"></span>
diff --git a/ext/search_kit/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html
index fc7455366d05..8cd8e13ba688 100644
--- a/ext/search_kit/ang/crmSearchAdmin/tabs.html
+++ b/ext/search_kit/ang/crmSearchAdmin/tabs.html
@@ -26,7 +26,7 @@
   </button>
 </li>
 <li role="presentation">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+  <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     <i class="crm-i fa-plus"></i> {{:: ts('Add...') }} <span class="caret"></span>
   </button>
   <ul class="dropdown-menu">

From ddfb2aecc9767c89968fb2597dcc7c21b58ac93d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 5 Oct 2021 10:41:00 -0400
Subject: [PATCH 2/2] SearchKit - Consistently use one-time binding with ts()

---
 ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html     | 8 ++++----
 .../ang/crmSearchAdmin/crmSearchAdminDisplaySort.html     | 4 ++--
 .../ang/crmSearchAdmin/displays/colType/field.html        | 2 +-
 .../crmSearchAdmin/displays/searchAdminDisplayGrid.html   | 2 +-
 .../crmSearchAdmin/displays/searchAdminDisplayList.html   | 2 +-
 ext/search_kit/ang/crmSearchAdmin/group.html              | 2 +-
 ext/search_kit/ang/crmSearchAdmin/tabs.html               | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
index a4867088092f..ca6c2a2c4b5e 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
@@ -14,7 +14,7 @@ <h1 crm-page-title>{{ $ctrl.entityTitle + ': ' + $ctrl.savedSearch.label }}</h1>
   <form>
     <div class="crm-flex-box">
       <div class="nav-stacked">
-        <input id="crm-saved-search-label" class="form-control" ng-model="$ctrl.savedSearch.label" type="text" required placeholder="{{ ts('Untitled Search') }}" />
+        <input id="crm-saved-search-label" class="form-control" ng-model="$ctrl.savedSearch.label" type="text" required placeholder="{{:: ts('Untitled Search') }}" />
       </div>
       <div class="crm-flex-4 form-inline">
         <label for="crm-search-main-entity">{{:: ts('Search for') }}</label>
@@ -22,9 +22,9 @@ <h1 crm-page-title>{{ $ctrl.entityTitle + ': ' + $ctrl.savedSearch.label }}</h1>
         <div class="btn-group btn-group-md pull-right">
           <button type="button" class="btn" ng-class="{'btn-primary': status === 'unsaved', 'btn-warning': status === 'saving', 'btn-success': status === 'saved'}" ng-disabled="status !== 'unsaved'" ng-click="$ctrl.save()">
             <i class="crm-i" ng-class="{'fa-check': status !== 'saving', 'fa-spin fa-spinner': status === 'saving'}"></i>
-            <span ng-if="status === 'saved'">{{ ts('Saved') }}</span>
-            <span ng-if="status === 'unsaved'">{{ ts('Save') }}</span>
-            <span ng-if="status === 'saving'">{{ ts('Saving...') }}</span>
+            <span ng-if="status === 'saved'">{{:: ts('Saved') }}</span>
+            <span ng-if="status === 'unsaved'">{{:: ts('Save') }}</span>
+            <span ng-if="status === 'saving'">{{:: ts('Saving...') }}</span>
           </button>
         </div>
       </div>
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
index a3a1cf737e23..248ef07b4671 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
@@ -2,8 +2,8 @@
   <label for="crm-search-display-sort-{{$index}}">{{ $index ? ts('Also by') : ts('Sort by') }}</label>
   <input id="crm-search-display-sort-{{$index}}" class="form-control huge" ng-model="sort[0]" crm-ui-select="{data: $ctrl.parent.fieldsForSort}" />
   <select class="form-control" ng-model="sort[1]" ng-show="sort[0] !== 'RAND()'">
-    <option value="ASC">{{ ts('Ascending') }}</option>
-    <option value="DESC">{{ ts('Descending') }}</option>
+    <option value="ASC">{{:: ts('Ascending') }}</option>
+    <option value="DESC">{{:: ts('Descending') }}</option>
   </select>
   <a href class="crm-hover-button" title="{{:: ts('Clear') }}" ng-click="$ctrl.display.settings.sort.splice($index, 1)"><i class="crm-i fa-times" aria-hidden="true"></i></a>
 </div>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
index 278ed6ffee14..801c3d310830 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
@@ -35,7 +35,7 @@
   </div>
 </div>
 <div class="form-inline crm-search-admin-flex-row">
-  <label title="{{ ts('Change the contents of this field, or combine multiple field values.') }}">
+  <label title="{{:: ts('Change the contents of this field, or combine multiple field values.') }}">
     <input type="checkbox" ng-checked="col.rewrite" ng-click="$ctrl.parent.toggleRewrite(col)" >
     {{:: ts('Rewrite') }}
   </label>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
index 2da44b558076..f08c98c63376 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
@@ -20,7 +20,7 @@
   <div class="crm-search-admin-edit-columns" ng-model="$ctrl.display.settings.columns" ui-sortable="$ctrl.parent.sortableOptions">
     <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
       <legend><i class="crm-i fa-arrows crm-search-move-icon"></i> {{ $ctrl.parent.getColLabel(col) }}</legend>
-      <div class="form-inline" title="{{ ts('Should this item display on its own line or inline with other items?') }}">
+      <div class="form-inline" title="{{:: ts('Should this item display on its own line or inline with other items?') }}">
         <label><input type="checkbox" ng-model="col.break"> {{:: ts('New Line') }}</label>
         <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.removeCol($index)" title="{{:: ts('Remove') }}">
           <i class="crm-i fa-ban"></i>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
index 5d733db80b5b..3561df20b923 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
@@ -24,7 +24,7 @@
   <div class="crm-search-admin-edit-columns" ng-model="$ctrl.display.settings.columns" ui-sortable="$ctrl.parent.sortableOptions">
     <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
       <legend><i class="crm-i fa-arrows crm-search-move-icon"></i> {{ $ctrl.parent.getColLabel(col) }}</legend>
-      <div class="form-inline" title="{{ ts('Should this item display on its own line or inline with other items?') }}">
+      <div class="form-inline" title="{{:: ts('Should this item display on its own line or inline with other items?') }}">
         <label><input type="checkbox" ng-model="col.break"> {{:: ts('New Line') }}</label>
         <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.removeCol($index)" title="{{:: ts('Remove') }}">
           <i class="crm-i fa-ban"></i>
diff --git a/ext/search_kit/ang/crmSearchAdmin/group.html b/ext/search_kit/ang/crmSearchAdmin/group.html
index db196e39307a..66a8e5cb083e 100644
--- a/ext/search_kit/ang/crmSearchAdmin/group.html
+++ b/ext/search_kit/ang/crmSearchAdmin/group.html
@@ -3,7 +3,7 @@
 </div>
 
 <div class="form-inline">
-  <label for="crm-search-admin-group-title">{{ ts('Group Title') }} <span class="crm-marker">*</span></label>
+  <label for="crm-search-admin-group-title">{{:: ts('Group Title') }} <span class="crm-marker">*</span></label>
   <input id="crm-search-admin-group-title" class="form-control" placeholder="{{:: ts('Untitled') }}" ng-model="$ctrl.savedSearch.groups[0].title" ng-disabled="!smartGroupColumns.length" ng-required="smartGroupColumns.length">
   <label for="api-save-search-select-column">{{:: ts('Contact Column') }}</label>
   <input id="api-save-search-select-column" ng-model="$ctrl.savedSearch.api_params.select[0]" class="form-control huge" crm-ui-select="{data: smartGroupColumns}"/>
diff --git a/ext/search_kit/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html
index 8cd8e13ba688..22841b6d04b9 100644
--- a/ext/search_kit/ang/crmSearchAdmin/tabs.html
+++ b/ext/search_kit/ang/crmSearchAdmin/tabs.html
@@ -4,7 +4,7 @@
 <li role="presentation" ng-class="{active: controls.tab === 'compose'}">
   <a href ng-click="selectTab('compose')">
     <i class="crm-i fa-gears"></i>
-    {{ ts('Compose Search') }}
+    {{:: ts('Compose Search') }}
   </a>
 </li>
 <li role="presentation" ng-class="{active: controls.tab === 'group'}" ng-if="$ctrl.savedSearch.groups.length" title="{{ !$ctrl.groupExists ? ts('Group will be deleted.') : '' }}">
@@ -36,7 +36,7 @@
         {{:: ts('Smart Group') }}
       </a>
     </li>
-    <li class="dropdown-header">{{ ts('Display') }}</li>
+    <li class="dropdown-header">{{:: ts('Display') }}</li>
     <li ng-repeat="type in ::$ctrl.displayTypes">
       <a href ng-click="$ctrl.addDisplay(type.id)">
         <i class="crm-i {{:: type.icon }}"></i>