X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2FCRM%2FActivity%2FForm%2FActivity.tpl;h=925a3f9b3adcb4dd1ea29c3ffe46dbebe3bd5987;hb=03ca7bcbab1e6db06284e307b99661edb2074078;hp=9069edfc8887d7f1c139c97ba56e55bba2ed27be;hpb=b7fe18b45e8a71e1a24f775e72720d4bcfe27392;p=civicrm-core.git
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 9069edfc88..925a3f9b3a 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -79,7 +79,7 @@
- {if $form.separation }
+ {if $form.separation}
{$form.separation.label} |
{$form.separation.html} {help id="separation"} |
@@ -150,10 +150,12 @@
{$form.details.label} |
+ {* activityTypeName means label here not name, but it should be name (dev/core#1116-fixme) *}
{if $activityTypeName eq "Print PDF Letter"}
{$form.details.html}
|
+ {* activityTypeName means label here not name, but it should be name (dev/core#1116-fixme) *}
{elseif $activityTypeName eq "Inbound Email"}
{$form.details.html|crmStripAlternatives|nl2br}
@@ -189,9 +191,10 @@
|
{if $action eq 4}
- {include file="CRM/Custom/Page/CustomDataView.tpl"}
- {else}
+ {include file="CRM/Custom/Page/CustomDataView.tpl"}
+ {else}
+ {include file="CRM/common/customDataBlock.tpl"}
{/if}
|
@@ -293,8 +296,6 @@
});
{/literal}
-
- {include file="CRM/common/customDataBlock.tpl"}
{/if}
{* end of form block*}