Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-03-17-29-16

[civicrm-core.git] / templates / CRM / Case / Form / Activity.tpl

diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index 8f8a7b5eb49c1e295d0f824d0a0e72a46ee19300..e7077cec99407d8f653b3d0e0c9580f1e03e9b54 100644 (file)
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -29,7 +29,7 @@
   {include file="CRM/Custom/Form/CustomData.tpl"}
 {else}
 <h3>{if $action eq 1 or $action eq 1024}
-  {ts 1=$activityTypeName}New %1{/ts}
+  {ts 1=$activityTypeName}New activity: %1{/ts}
   {elseif $action eq 8}{ts 1=$activityTypeName}Delete %1{/ts}
   {elseif $action eq 32768}{ts 1=$activityTypeName}Restore %1{/ts}
   {else}{ts 1=$activityTypeName}Edit %1{/ts}{/if}
@@ -147,7 +147,7 @@
         {edit}
           <span class="description">
           {ts}You can optionally assign this activity to someone.{/ts}
-          {if $config->activityAssigneeNotification}
+          {if $activityAssigneeNotification}
             <br />{ts}A copy of this activity will be emailed to each Assignee.{/ts}
           {/if}
           </span>
@@ -300,11 +300,12 @@
   {include file="CRM/common/customData.tpl"}
     {literal}
     <script type="text/javascript">
-      cj(document).ready(function() {
+    cj(function() {
     {/literal}
-    CRM.buildCustomData( '{$customDataType}' );
     {if $customDataSubType}
       CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
+      {else}
+      CRM.buildCustomData( '{$customDataType}' );
     {/if}
     {literal}
     });