SearchKit - Rename searchList template to match controller, move "New Search" button...

diff --git a/ext/search_kit/ang/crmSearchAdmin.module.js b/ext/search_kit/ang/crmSearchAdmin.module.js
index 8ac46b3938b89efa6b090ccc2a6c6333d58cb82d..5e34b1ee6665a8e186fc2941037476988dc6406c 100644 (file)
--- a/ext/search_kit/ang/crmSearchAdmin.module.js
+++ b/ext/search_kit/ang/crmSearchAdmin.module.js
@@ -13,7 +13,7 @@
       $routeProvider.when('/list', {
         controller: 'searchList',
         reloadOnSearch: false,
-        templateUrl: '~/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html',
+        templateUrl: '~/crmSearchAdmin/searchListing/searchList.html',
       });
       $routeProvider.when('/create/:entity', {
         controller: 'searchCreate',

diff --git a/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html b/ext/search_kit/ang/crmSearchAdmin/searchListing/searchList.html
similarity index 72%
rename from ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html
rename to ext/search_kit/ang/crmSearchAdmin/searchListing/searchList.html
index 2f0361fd1a3305f5fc6cf1565f98676f5aadfaa6..f549ca1bca15d8b396aa9f479eba98365fadde07 100644 (file)
--- a/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html
+++ b/ext/search_kit/ang/crmSearchAdmin/searchListing/searchList.html
@@ -2,14 +2,20 @@
   <h1 crm-page-title>{{:: ts('Saved Searches') }}</h1>
 
   <!-- Tabs based on the has_base filter -->
-  <ul class="nav nav-tabs">
-    <li ng-repeat="tab in $ctrl.tabs" role="presentation" ng-class="{active: $ctrl.tab === tab.name}">
-      <a href ng-click="$ctrl.tab = tab.name"><i class="crm-i {{:: tab.icon }}"></i>
-        {{:: tab.title }}
-        <span class="badge">{{ tab.rowCount }}</span>
-      </a>
-    </li>
-  </ul>
+  <div class="crm-search-nav-tabs">
+    <ul class="nav nav-tabs">
+      <li ng-repeat="tab in $ctrl.tabs" role="presentation" ng-class="{active: $ctrl.tab === tab.name}">
+        <a href ng-click="$ctrl.tab = tab.name"><i class="crm-i {{:: tab.icon }}"></i>
+          {{:: tab.title }}
+          <span class="badge">{{ tab.rowCount }}</span>
+        </a>
+      </li>
+    </ul>
+    <a class="btn btn-primary" href="#/create/Contact/">
+      <i class="crm-i fa-plus"></i>
+      {{:: ts('New Search') }}
+    </a>
+  </div>
 
   <div ng-repeat="tab in $ctrl.tabs" ng-show="$ctrl.tab === tab.name">
     <div class="form-inline">
@@ -22,10 +28,6 @@
       <span ng-if="$ctrl.getTags().results.length">
         <input class="form-control" ng-model="tab.filters.tags" ng-list crm-ui-select="{multiple: true, data: $ctrl.getTags, placeholder: ts('Filter by tags...')}">
       </span>
-      <a class="btn btn-primary pull-right" ng-if="tab.name === 'custom'" href="#/create/Contact/">
-        <i class="crm-i fa-plus"></i>
-        {{:: ts('New Search') }}
-      </a>
     </div>
     <crm-search-admin-search-listing filters="tab.filters" tab-count="tab.rowCount"></crm-search-admin-search-listing>
   </div>

diff --git a/ext/search_kit/css/crmSearchAdmin.css b/ext/search_kit/css/crmSearchAdmin.css
index 39ea08371750a56982a286993be6d0cc45b9dd29..3d159af72a4c2f56d3d9c2826f66719a2bc620bd 100644 (file)
--- a/ext/search_kit/css/crmSearchAdmin.css
+++ b/ext/search_kit/css/crmSearchAdmin.css
@@ -3,6 +3,15 @@
   min-width: 500px;
 }
 
+#bootstrap-theme .crm-search-nav-tabs {
+  position: relative;
+}
+#bootstrap-theme .crm-search-nav-tabs > a.btn {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
 #bootstrap-theme.crm-search .nav-stacked {
   margin-left: 0;
   margin-right: 20px;