CRM-13966 - Style select2 results with description field

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 8dd4f7750d139923d9f3d7b498953be44e4589b0..40535306545a62beab74d5cc6e46f3f690829d07 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -918,7 +918,7 @@ function _civicrm_api3_contact_getlist_params(&$request) {
   if(!in_array($searchField, $list)) {
     $list[] = $searchField;
   }
-  $request['params']['options']['return'] = $list;
+  $request['params']['return'] = $list;
   $request['params']['options']['sort'] = 'sort_name';
   // Contact api doesn't support array(LIKE => 'foo') syntax
   $request['params'][$request['search_field']] = $request['input'];
@@ -941,7 +941,7 @@ function _civicrm_api3_contact_getlist_output($result, $request) {
         'label' => $row[$request['label_field']],
       );
       $description = array();
-      foreach ($request['params']['options']['return'] as $item) {
+      foreach ($request['params']['return'] as $item) {
         if (!strpos($item, '_name') && !empty($row[$item])) {
           $description[] = $row[$item];
         }

diff --git a/api/v3/Generic/Getlist.php b/api/v3/Generic/Getlist.php
index 3d181b7917a51891722a5bfecac5cc98cf41ea82..c3388f94717323c83d4dd5d23bcf9a58617bec79 100644 (file)
--- a/api/v3/Generic/Getlist.php
+++ b/api/v3/Generic/Getlist.php
@@ -128,7 +128,7 @@ function _civicrm_api3_generic_getlist_params(&$request) {
   if (!empty($request['description_field'])) {
     $fieldsToReturn[] = $request['description_field'];
   }
-  $request['params']['options']['return'] = $fieldsToReturn;
+  $request['params']['return'] = $fieldsToReturn;
 }
 
 /**

diff --git a/css/civicrm.css b/css/civicrm.css
index 85ce033c6daff0aff401d69a84779aba8d149975..b333cefcb55d6b140a04e3516b986b955f34fa14 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3835,6 +3835,27 @@ div.m ul#civicrm-menu,
 .crm-container .select2-dropdown-open .select2-choice .select2-arrow b {
   background-position: -18px 1px;
 }
+/* Style autocomplete results */
+.select2-results table.crm-select2-row,
+.select2-results table.crm-select2-row tbody,
+.select2-results table.crm-select2-row tr,
+.select2-results table.crm-select2-row td {
+  border: 0 none;
+  padding: 0;
+  margin: 0;
+  border-collapse: collapse;
+}
+.select2-results table.crm-select2-row .crm-select2-row-label {
+  font-size: 1.1em;
+}
+.select2-results table.crm-select2-row .crm-select2-row-description {
+  font-size: 0.8em;
+  line-height: 1.5em;
+  color: #696969;
+}
+.select2-results .select2-highlighted table.crm-select2-row .crm-select2-row-description {
+  color: #f0f0f0;
+}
 
 /* Special styling for specific form buttons */
 #crm-container span.crm-button_qf_Main_upload input,

diff --git a/js/Common.js b/js/Common.js
index d2bdace84b2d58eda9de6601ba64700c1b2779a3..6ec6e97e1c408b61d47a83e3109df6bc3b41ea31 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -276,9 +276,9 @@ CRM.validate = CRM.validate || {
   CRM.utils.formatSelect2Result = function(row) {
     var markup = '<table class="crm-select2-row"><tr>';
     if (row.image !== undefined) {
-      markup += '<td class="crm-select2-row-image"><img src="' + row.image + '"/></td>';
+      markup += '<td class="crm-select2-image"><img src="' + row.image + '"/></td>';
     }
-    markup += '<td class="crm-select2-row-content"><div class="crm-select2-row-label">' + row.label + '</div>';
+    markup += '<td><div class="crm-select2-row-label">' + row.label + '</div>';
     markup += '<div class="crm-select2-row-description">' + (row.description || '') + '</div>';
     markup += '</td></tr></table>';
     return markup;