Skip to content

Commit

Permalink
Remove unneeded descriptions and clean up on search forms
Browse files Browse the repository at this point in the history
  • Loading branch information
larssandergreen committed Jun 1, 2023
1 parent 486cd11 commit 0348f12
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 35 deletions.
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions CRM/Group/Form/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</div>
<div af-fieldset="">
<div class="af-container af-layout-inline">
<af-field name="title" defn="{label: 'Title', input_attrs: {}, help_post: 'Complete OR partial Contribution Page Title'}" />
<af-field name="title" defn="{label: 'Title', input_attrs: {}}" />
<af-field name="financial_type_id" defn="{input_type: 'CheckBox', input_attrs: {}}" />
</div>
<div class="btn-group pull-right">
Expand Down
7 changes: 1 addition & 6 deletions templates/CRM/Batch/Form/Search.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
<h3>{ts}Data Entry Batches{/ts}</h3>
<table class="form-layout-compressed">
<tr>
<td>
{$form.title.html}<br />
<span class="description font-italic">
{ts}Complete OR partial batch name.{/ts}
</span>
</td>
<td>{$form.title.html}</td>
<td>{include file="CRM/common/formButtons.tpl" location=''}</td>
</tr>
</table>
Expand Down
7 changes: 1 addition & 6 deletions templates/CRM/Contribute/Form/SearchContribution.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
<h3>{ts}Find Contribution Pages{/ts}</h3>
<table class="form-layout-compressed">
<tr>
<td>{$form.title.html}
<div class="description font-italic">
{ts}Complete OR partial Contribution Page title.{/ts}
</div>
</td>

<td>{$form.title.html}</td>
<td>
<label>{ts}Financial Type{/ts}</label>
<div class="listing-box">
Expand Down
3 changes: 0 additions & 3 deletions templates/CRM/Event/Form/SearchEvent.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<td>
<label>{$form.title.label}</label>
{$form.title.html|crmAddClass:twenty}
<div class="description font-italic">
{ts}Complete OR partial Event name.{/ts}
</div>
</td>
<td><label>{ts}Event Type{/ts}</label>
{$form.event_type_id.html}
Expand Down
20 changes: 4 additions & 16 deletions templates/CRM/Group/Form/Search.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,24 @@
<tr>
<td>
{$form.title.label}<br />
{$form.title.html}<br />
<span class="description font-italic">
{ts}Complete OR partial group name.{/ts}
</span>
{$form.title.html}
</td>
{if !empty($form.created_by)}
<td>
{$form.created_by.label}<br />
{$form.created_by.html}<br />
<span class="description font-italic">
{ts}Complete OR partial creator name.{/ts}
</span>
{$form.created_by.html}
</td>
{/if}
<td>
{$form.visibility.label}<br />
{$form.visibility.html}<br />
<span class="description font-italic">
{ts}Filter search by visibility.{/ts}
</span>
{$form.visibility.html}
</td>
</tr>
<tr>
{if !empty($form.group_type_search)}
<td id="group_type-block">
{$form.group_type_search.label}<br />
{$form.group_type_search.html}<br />
<span class="description font-italic">
{ts}Filter search by group type(s).{/ts}
</span>
{$form.group_type_search.html}
</td>
{/if}
{if !empty($form.group_status)}
Expand Down

0 comments on commit 0348f12

Please sign in to comment.