diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl
index 2e668c494158759d03ea8354a148be721ed293f9..63ae287227448bae744c3557992ef5ba3ee35657 100644
--- a/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -29,11 +29,11 @@
{* Provide link to modify smart group search criteria if we are viewing a smart group (ssID = saved search ID) *}
{if !empty($ssID)}
{if $ssMappingID}
- {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&force=1&ssID=`$ssID`"}{/capture}
+ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&ssID=`$ssID`"}{/capture}
{elseif $savedSearch.search_custom_id}
- {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&force=1&ssID=`$ssID`"}{/capture}
+ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&ssID=`$ssID`"}{/capture}
{else}
- {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$ssID`"}{/capture}
+ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$ssID`"}{/capture}
{/if}
<div class="crm-submit-buttons">
<a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index dd8505d4e2536077dab50558d24d2f5b6a36b28d..6fbab00645c6bb805c78f3d58fba89d35db433bf 100644
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -25,103 +25,103 @@
*}
{* this template is used for adding/editing group (name and description only) *}
<div class="crm-block crm-form-block crm-group-form-block">
- <div class="help">
- {if $action eq 2}
+ <div class="help">
+ {if $action eq 2}
{capture assign=crmURL}class="no-popup" href="{crmURL p="civicrm/group/search" q="reset=1&force=1&context=smog&gid=`$group.id`"}"{/capture}
{ts 1=$crmURL}You can edit the Name and Description for this group here. Click <a %1>Contacts in this Group</a> to view, add or remove contacts in this group.{/ts}
- {else}
+ {else}
{ts}Enter a unique name and a description for your new group here. Then click 'Continue' to find contacts to add to your new group.{/ts}
- {/if}
- </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
- <table class="form-layout">
- <tr class="crm-group-form-block-title">
+ {/if}
+ </div>
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+ <table class="form-layout">
+ <tr class="crm-group-form-block-title">
<td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_group' field='title' id=$group.id}{/if}</td>
- <td>{$form.title.html|crmAddClass:huge}
- {if $group.saved_search_id} ({ts}Smart Group{/ts}){/if}
- </td>
- </tr>
+ <td>{$form.title.html|crmAddClass:huge}
+ {if $group.saved_search_id} ({ts}Smart Group{/ts}){/if}
+ </td>
+ </tr>
- {if $group.created_by}
- <tr class="crm-group-form-block-created">
- <td class="label">{ts}Created By{/ts}</td>
- <td>{$group.created_by}</td>
- </tr>
- {/if}
+ {if $group.created_by}
+ <tr class="crm-group-form-block-created">
+ <td class="label">{ts}Created By{/ts}</td>
+ <td>{$group.created_by}</td>
+ </tr>
+ {/if}
- {if $group.modified_by}
- <tr class="crm-group-form-block-modified">
- <td class="label">{ts}Modified By{/ts}</td>
- <td>{$group.modified_by}</td>
- </tr>
- {/if}
+ {if $group.modified_by}
+ <tr class="crm-group-form-block-modified">
+ <td class="label">{ts}Modified By{/ts}</td>
+ <td>{$group.modified_by}</td>
+ </tr>
+ {/if}
- <tr class="crm-group-form-block-description">
+ <tr class="crm-group-form-block-description">
<td class="label">{$form.description.label}</td>
<td>{$form.description.html}<br />
- <span class="description">{ts}Group description is displayed when groups are listed in Profiles and Mailing List Subscribe forms.{/ts}</span>
- </td>
- </tr>
+ <span class="description">{ts}Group description is displayed when groups are listed in Profiles and Mailing List Subscribe forms.{/ts}</span>
+ </td>
+ </tr>
- {if $form.group_type}
+ {if $form.group_type}
<tr class="crm-group-form-block-group_type">
- <td class="label">{$form.group_type.label}</td>
- <td>{$form.group_type.html} {help id="id-group-type" file="CRM/Group/Page/Group.hlp"}</td>
+ <td class="label">{$form.group_type.label}</td>
+ <td>{$form.group_type.html} {help id="id-group-type" file="CRM/Group/Page/Group.hlp"}</td>
</tr>
- {/if}
+ {/if}
- <tr class="crm-group-form-block-visibility">
+ <tr class="crm-group-form-block-visibility">
<td class="label">{$form.visibility.label}</td>
<td>{$form.visibility.html|crmAddClass:huge} {help id="id-group-visibility" file="CRM/Group/Page/Group.hlp"}</td>
- </tr>
+ </tr>
- <tr class="crm-group-form-block-isReserved">
- <td class="label">{$form.is_reserved.label}</td>
- <td>{$form.is_reserved.html}
- <span class="description">{ts}If reserved, only users with 'administer reserved groups' permission can disable, delete, or change settings for this group. The reserved flag does NOT affect users ability to add or remove contacts from a group.{/ts}</span>
- </td>
- </tr>
+ <tr class="crm-group-form-block-isReserved">
+ <td class="label">{$form.is_reserved.label}</td>
+ <td>{$form.is_reserved.html}
+ <span class="description">{ts}If reserved, only users with 'administer reserved groups' permission can disable, delete, or change settings for this group. The reserved flag does NOT affect users ability to add or remove contacts from a group.{/ts}</span>
+ </td>
+ </tr>
- <tr class="crm-group-form-block-isActive">
- <td class="label">{$form.is_active.label}</td>
- <td>{$form.is_active.html}</td>
- </tr>
+ <tr class="crm-group-form-block-isActive">
+ <td class="label">{$form.is_active.label}</td>
+ <td>{$form.is_active.html}</td>
+ </tr>
- <tr>
+ <tr>
<td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
- </tr>
- </table>
+ </tr>
+ </table>
{*CRM-14190*}
{include file="CRM/Group/Form/GroupsCommon.tpl"}
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
- {if $action neq 1}
- <div class="action-link">
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+ {if $action neq 1}
+ <div class="action-link">
<a {$crmURL}>» {ts}Contacts in this Group{/ts}</a>
{if $group.saved_search_id}
- <br />
- {if $group.mapping_id}
- <a class="no-popup" href="{crmURL p="civicrm/contact/search/builder" q="reset=1&force=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
- {elseif $group.search_custom_id}
- <a class="no-popup" href="{crmURL p="civicrm/contact/search/custom" q="reset=1&force=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
- {else}
- <a class="no-popup" href="{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
- {/if}
+ <br />
+ {if $group.mapping_id}
+ <a class="no-popup" href="{crmURL p="civicrm/contact/search/builder" q="reset=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
+ {elseif $group.search_custom_id}
+ <a class="no-popup" href="{crmURL p="civicrm/contact/search/custom" q="reset=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
+ {else}
+ <a class="no-popup" href="{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$group.saved_search_id`"}">» {ts}Edit Smart Group Criteria{/ts}</a>
+ {/if}
{/if}
- </div>
- {/if}
+ </div>
+ {/if}
-{literal}
-<script type="text/javascript">
-{/literal}{if $freezeMailignList}{literal}
-cj('input[type=checkbox][name="group_type[{/literal}{$freezeMailignList}{literal}]"]').prop('disabled',true);
-{/literal}{/if}{literal}
-{/literal}{if $hideMailignList}{literal}
-cj('input[type=checkbox][name="group_type[{/literal}{$hideMailignList}{literal}]"]').hide();
-cj('label[for="group_type[{/literal}{$hideMailignList}{literal}]"]').hide();
-{/literal}{/if}{literal}
-</script>
-{/literal}
+ {literal}
+ <script type="text/javascript">
+ {/literal}{if $freezeMailignList}{literal}
+ cj('input[type=checkbox][name="group_type[{/literal}{$freezeMailignList}{literal}]"]').prop('disabled',true);
+ {/literal}{/if}{literal}
+ {/literal}{if $hideMailignList}{literal}
+ cj('input[type=checkbox][name="group_type[{/literal}{$hideMailignList}{literal}]"]').hide();
+ cj('label[for="group_type[{/literal}{$hideMailignList}{literal}]"]').hide();
+ {/literal}{/if}{literal}
+ </script>
+ {/literal}
</div>