From 7ff7ebc805f63d589f0eae0c80a4e0934f3401db Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 23 Nov 2020 18:49:34 -0500
Subject: [PATCH] Improve options in list search display

---
 .../displays/searchAdminDisplayList.component.js      | 11 +++++------
 .../displays/searchAdminDisplayList.html              |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
index 9697a687afa2..8517f149b7eb 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
@@ -34,15 +34,14 @@
       this.symbols = {
         ul: [
           {char: '', label: ts('Default')},
-          {char: 'none', label: ts('None ( )')},
-          {char: 'circle', label: ts('Circle')},
-          {char: 'square', label: ts('Square')},
+          {char: 'circle', label: ts('Circles')},
+          {char: 'square', label: ts('Squares')},
+          {char: 'none', label: ts('None')},
         ],
         ol: [
-          {char: '', label: ts('Numbered (1. 2. 3.)')},
-          {char: 'none', label: ts('None ( )')},
-          {char: 'lower-latin', label: ts('Lowercase (a. b. c.)')},
+          {char: '', label: ts('Default (1. 2. 3.)')},
           {char: 'upper-latin', label: ts('Uppercase (A. B. C.)')},
+          {char: 'lower-latin', label: ts('Lowercase (a. b. c.)')},
           {char: 'upper-roman', label: ts('Roman (I. II. III.)')},
         ]
       };
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
index 926a595e5da7..962f744c6f7d 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
@@ -2,8 +2,8 @@
   <div class="form-inline">
     <label for="crm-search-admin-display-style">{{:: ts('Style:') }}</label>
     <select id="crm-search-admin-display-style" class="form-control" ng-model="$ctrl.display.settings.style" ng-change="$ctrl.display.settings.symbol = ''">
-      <option value="ul">{{:: ts('Bulleted') }}</option>
-      <option value="ol">{{:: ts('Numbered') }}</option>
+      <option value="ul">{{:: ts('Bullets') }}</option>
+      <option value="ol">{{:: ts('Numbers') }}</option>
     </select>
     <label for="crm-search-admin-display-symbol">{{:: ts('Symbol:') }}</label>
     <select id="crm-search-admin-display-symbol" class="form-control" ng-model="$ctrl.display.settings.symbol">