projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into recurring-activity-46
[civicrm-core.git]
/
templates
/
CRM
/
UF
/
Form
/
Field.tpl
diff --git
a/templates/CRM/UF/Form/Field.tpl
b/templates/CRM/UF/Form/Field.tpl
index 02f4572378a4595b919225e1a878fcfb27061cb6..2b0f5dc0c4c3011a7f91c6effdf8404bbd473195 100644
(file)
--- a/
templates/CRM/UF/Form/Field.tpl
+++ b/
templates/CRM/UF/Form/Field.tpl
@@
-23,7
+23,6
@@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-<h3>{if $action eq 8}{ts}Delete Field{/ts} - {$fieldTitle}{elseif $action eq 1}{ts}Add Field{/ts}{elseif $action eq 2}{ts}Edit Field{/ts} - {$fieldTitle}{/if}</h3>
<div class="crm-block crm-form-block crm-uf-field-form-block">
{if $action eq 8}
<div class="messages status no-popup">
<div class="crm-block crm-form-block crm-uf-field-form-block">
{if $action eq 8}
<div class="messages status no-popup">
@@
-91,12
+90,9
@@
{literal}
<script type="text/javascript">
{literal}
<script type="text/javascript">
-var otherModule = new Array( );
-{/literal}{foreach from=$otherModules item="mval" key="mkey"}{literal}
-otherModule[{/literal}{$mkey}{literal}] = '{/literal}{$mval}{literal}';
-{/literal}{/foreach}{literal}
CRM.$(function($) {
CRM.$(function($) {
+ var otherModule = {/literal}{$otherModules|@json_encode}{literal};
if ( $.inArray( "Profile", otherModule ) > -1 && $.inArray( "Search Profile", otherModule ) == -1 ){
$('#profile_visibility').show();
}
if ( $.inArray( "Profile", otherModule ) > -1 && $.inArray( "Search Profile", otherModule ) == -1 ){
$('#profile_visibility').show();
}