diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index ac6ea213b472..1abf33ef4fee 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -985,7 +985,7 @@ public static function buildSearchForm(&$form) { ] ); - $form->addField('financial_trxn_card_type_id', ['entity' => 'FinancialTrxn', 'name' => 'card_type_id', 'action' => 'get']); + $form->addField('financial_trxn_card_type_id', ['entity' => 'FinancialTrxn', 'name' => 'card_type_id', 'action' => 'get', 'label' => ts('Card Type')]); $form->add('text', 'financial_trxn_pan_truncation', ts('Card Number'), [ 'size' => 5, diff --git a/CRM/Group/Form/Search.php b/CRM/Group/Form/Search.php index 9ff60f05aadc..c4f303161135 100644 --- a/CRM/Group/Form/Search.php +++ b/CRM/Group/Form/Search.php @@ -35,11 +35,11 @@ public function setDefaultValues() { } public function buildQuickForm() { - $this->add('text', 'title', ts('Find'), + $this->add('text', 'title', ts('Group Name'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Group', 'title') ); - $this->add('text', 'created_by', ts('Created By'), + $this->add('text', 'created_by', ts('Created By (Name)'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Group', 'title') ); diff --git a/ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.html b/ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.html index 7c8cde1dcc7e..d1dd1833a8d3 100644 --- a/ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.html +++ b/ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.html @@ -3,7 +3,7 @@
- +
diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl index 66054c2c9c6e..45b13212f4ad 100644 --- a/templates/CRM/Batch/Form/Search.tpl +++ b/templates/CRM/Batch/Form/Search.tpl @@ -11,12 +11,7 @@

{ts}Data Entry Batches{/ts}

- +
- {$form.title.html}
- - {ts}Complete OR partial batch name.{/ts} - -
{$form.title.html} {include file="CRM/common/formButtons.tpl" location=''}
diff --git a/templates/CRM/Contribute/Form/SearchContribution.tpl b/templates/CRM/Contribute/Form/SearchContribution.tpl index a282a719b506..5e154aa1352d 100644 --- a/templates/CRM/Contribute/Form/SearchContribution.tpl +++ b/templates/CRM/Contribute/Form/SearchContribution.tpl @@ -11,12 +11,7 @@

{ts}Find Contribution Pages{/ts}

- - + {if !empty($form.created_by)} {/if} {if !empty($form.group_type_search)} {/if} {if !empty($form.group_status)}
{$form.title.html} -
- {ts}Complete OR partial Contribution Page title.{/ts} -
-
{$form.title.html}
diff --git a/templates/CRM/Event/Form/SearchEvent.tpl b/templates/CRM/Event/Form/SearchEvent.tpl index fc064e42b976..45c02680e112 100644 --- a/templates/CRM/Event/Form/SearchEvent.tpl +++ b/templates/CRM/Event/Form/SearchEvent.tpl @@ -17,9 +17,6 @@
{$form.title.html|crmAddClass:twenty} -
- {ts}Complete OR partial Event name.{/ts} -
{$form.event_type_id.html} diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl index 67b4815b44e1..cc635783a5e5 100644 --- a/templates/CRM/Group/Form/Search.tpl +++ b/templates/CRM/Group/Form/Search.tpl @@ -18,36 +18,24 @@
{$form.title.label}
- {$form.title.html}
- - {ts}Complete OR partial group name.{/ts} - + {$form.title.html}
{$form.created_by.label}
- {$form.created_by.html}
- - {ts}Complete OR partial creator name.{/ts} - + {$form.created_by.html}
{$form.visibility.label}
- {$form.visibility.html}
- - {ts}Filter search by visibility.{/ts} - + {$form.visibility.html}
{$form.group_type_search.label}
- {$form.group_type_search.html}
- - {ts}Filter search by group type(s).{/ts} - + {$form.group_type_search.html}