From: eileen Date: Sun, 10 Jan 2016 23:11:11 +0000 (+1300) Subject: CRM-17439 layout changes for advanced search panes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e2b3c0e3747f5ee255abd5ed242dfad45e02bde2;p=civicrm-core.git CRM-17439 layout changes for advanced search panes --- diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php index 37cd6c4274..2bb9f0a919 100644 --- a/CRM/Contact/Form/Search/Criteria.php +++ b/CRM/Contact/Form/Search/Criteria.php @@ -149,7 +149,7 @@ class CRM_Contact_Form_Search_Criteria { $form->add('select', 'uf_group_id', - ts('Search Views'), + ts('Views For Display Contacts'), array( '0' => ts('- default view -'), ) + $searchProfiles, diff --git a/templates/CRM/Contact/Form/Search/Advanced.hlp b/templates/CRM/Contact/Form/Search/Advanced.hlp index 5e5d9e5ae3..23430f3106 100644 --- a/templates/CRM/Contact/Form/Search/Advanced.hlp +++ b/templates/CRM/Contact/Form/Search/Advanced.hlp @@ -27,8 +27,9 @@ {ts}Advanced Search{/ts} {/htxt} {htxt id='id-advanced-intro'} -

{ts}Use % wildcard(s) for partial matches. EXAMPLE: Enter 'Volunteer%' as your Activity Type to match any activity whose type is 'Volunteer' + any other words (e.g. Volunteer for Open House).{/ts}

-

{ts}If multiple boxes are checked for Contact Types, Groups, Tags and Location Types, the selections are combined as OR criteria (e.g. checking 'Group A' and 'Group B' will find contacts who are either in 'Group A' OR 'Group B'). All other search fields are combined as AND criteria (e.g. selecting Tag is 'Age' AND Country is 'Canada' returns only those contacts who meet both criteria).{/ts}

+

{ts}Use % wildcard(s) for partial matches. EXAMPLE: Enter 'Volunteer%' as your Activity Type to match any activity whose type is 'Volunteer' + any other words (e.g. Volunteer for Open House).{/ts}

+

{ts}When multiple options are selected within a search field the selections are combined using OR criteria (e.g. selecting both 'Group A' and 'Group B' will find contacts who are either in 'Group A' OR 'Group B' or in both).

+

By default the different search fields are combined using the AND Search Operator (e.g. selecting Tag is 'Age' AND Country is 'Canada' returns only those contacts who meet both criteria). You can override the Search Operator default for combining different fields in the Search Settings.{/ts}

{/htxt} {htxt id='id-advanced-smart-title'} @@ -61,10 +62,10 @@ {/htxt} {htxt id="id-search-views-title"} -{ts}Search Views{/ts} +{ts}Views For Display Contacts{/ts} {/htxt} {htxt id="id-search-views"} -

{ts}You can modify the columns displayed in your search results by creating a Profile containing a different set of contact fields and then selecting that Profile here. For example you may want to include columns for Gender and Date of Birth, while eliminating Country.{/ts} {docURL page="user/current/organising-your-data/profiles"}

+

{ts}If you are displaying the search results as contacts, you can modify the columns displayed by creating a Profile containing a different set of contact fields and then selecting that Profile here. For example you may want to include columns for Gender and Date of Birth, while eliminating Country.{/ts} {docURL page="user/current/organising-your-data/profiles"}

{/htxt} {htxt id="id-search-operator-title"} diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl index 4b50573610..67b507c400 100644 --- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl +++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl @@ -109,6 +109,22 @@ CRM.$(function($) { {/if} {strip} +
+
+ {ts}Display Settings For Results{/ts} +
+
+ {include file="CRM/Contact/Form/Search/Criteria/DisplaySettings.tpl"} +
+
+
+
+ {ts}Search Settings{/ts} +
+
+ {include file="CRM/Contact/Form/Search/Criteria/SearchSettings.tpl"} +
+
{ts}Basic Criteria{/ts} diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl index 141bbd0e73..97a7d1eeb7 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl @@ -32,26 +32,15 @@
{$form.email.html} - -
- {include file="CRM/common/formButtons.tpl" location="top"} -
-
- - - {ts}Reset Form{/ts} - -
- + {if $form.contact_type} +
+ {$form.contact_type.html} + + {else} +   + {/if} - {if $form.contact_type} -
- {$form.contact_type.html} - - {else} -   - {/if} {if $form.group}
@@ -95,8 +84,6 @@ {else}   {/if} - - {if $form.contact_tags} {$form.contact_tags.html} @@ -173,20 +160,14 @@ {$form.contact_source.label} {help id="id-source" file="CRM/Contact/Form/Contact"}
{$form.contact_source.html} - - {if $form.uf_user} - {$form.uf_user.label} {$form.uf_user.html} -
- {ts 1=$config->userFramework}Does the contact have a %1 Account?{/ts} -
- {else} -   - {/if} - {$form.job_title.label}
{$form.job_title.html} + + {$form.preferred_language.label}
+ {$form.preferred_language.html} + @@ -197,39 +178,15 @@ {$form.external_identifier.label} {help id="id-external-id" file="CRM/Contact/Form/Contact"}
{$form.external_identifier.html} - - {$form.preferred_language.label}
- {$form.preferred_language.html} - - - - -
- {ts}Search Settings{/ts} - - - - - - - -
- {$form.uf_group_id.label} {help id="id-search-views"}
{$form.uf_group_id.html} - 		- {if $form.component_mode} - {$form.component_mode.label} {help id="id-display-results"} -
- {$form.component_mode.html} - {if $form.display_relationship_type} -
{$form.display_relationship_type.html}
- {/if} - {else} -   - {/if} - 		{$form.operator.label} {help id="id-search-operator"}
{$form.operator.html}		 - {if $form.deleted_contacts}{$form.deleted_contacts.html} {$form.deleted_contacts.label}{/if} -
-
+ + {if $form.uf_user} + {$form.uf_user.label} {$form.uf_user.html} +
+ {ts 1=$config->userFramework}Does the contact have a %1 Account?{/ts} +
+ {else} +   + {/if} diff --git a/templates/CRM/Contact/Form/Search/Criteria/DisplaySettings.tpl b/templates/CRM/Contact/Form/Search/Criteria/DisplaySettings.tpl new file mode 100644 index 0000000000..997957014f --- /dev/null +++ b/templates/CRM/Contact/Form/Search/Criteria/DisplaySettings.tpl @@ -0,0 +1,21 @@ +
+ + + + + +
+ {if $form.component_mode} + {$form.component_mode.label} {help id="id-display-results"} +
+ {$form.component_mode.html} + {if $form.display_relationship_type} +
{$form.display_relationship_type.html}
+ {/if} + {else} +   + {/if} + 		+ {$form.uf_group_id.label} {help id="id-search-views"}
{$form.uf_group_id.html} +
+
diff --git a/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl b/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl new file mode 100644 index 0000000000..47a34fcb0d --- /dev/null +++ b/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl @@ -0,0 +1,21 @@ +
+ + + + + + +
{$form.operator.label} {help id="id-search-operator"}
{$form.operator.html}		 + {if $form.deleted_contacts}{$form.deleted_contacts.html} {$form.deleted_contacts.label}{/if} + +
+ {include file="CRM/common/formButtons.tpl" location="top"} +
+
+ + + {ts}Reset Form{/ts} + +
+
+