CRM-14383 - Update cj closures

[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 3a0220d2280cd17bec134ea41b287caf021a5c61..f5c044f6c8cb0e94f96615d7dea211d170223a57 100644 (file)
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,12 +28,6 @@
 {if $cdType }
   {include file="CRM/Custom/Form/CustomData.tpl"}
 {else}
-<h3>{if $action eq 1 or $action eq 1024}
-  {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}
-</h3>
 <div class="crm-block crm-form-block crm-case-activity-form-block">
 
   {if $action neq 8 and $action  neq 32768 }
@@ -81,7 +75,7 @@
       <tr class="crm-case-activity-form-block-target_contact_id hide-block" id="with-contacts-widget">
         <td class="label font-size10pt">{ts}With Contact{/ts}</td>
         <td class="view-value">
-          {include file="CRM/Contact/Form/NewContact.tpl" noLabel=true skipBreak=true multiClient=true}
+          {$form.target_contact_id.html}
           <br/>
           <a href="#" class="crm-with-contact">
             &raquo; {if not $multiClient}{ts}With client{/ts}{else}{ts}With client(s){/ts}{/if}
@@ -96,19 +90,18 @@
     </tr>
     <tr class="crm-case-activity-form-block-source_contact_id">
       <td class="label">{$form.source_contact_id.label}</td>
-      <td class="view-value"> {if $admin}{$form.source_contact_id.html}{/if}</td>
+      <td class="view-value">{$form.source_contact_id.html}</td>
     </tr>
     <tr class="crm-case-activity-form-block-assignee_contact_id">
-      <td class="label">{ts}Assigned To{/ts}</td>
+      <td class="label">
+        {$form.assignee_contact_id.label}
+        {edit}{help id="assignee_contact_id" title=$form.assignee_contact_id.label file="CRM/Activity/Form/Activity"}{/edit}
+      </td>
       <td>{$form.assignee_contact_id.html}
-        {edit}
-          <span class="description">
-          {ts}You can optionally assign this activity to someone.{/ts}
-          {if $activityAssigneeNotification}
-            <br />{ts}A copy of this activity will be emailed to each Assignee.{/ts}
-          {/if}
-          </span>
-        {/edit}
+        {if $activityAssigneeNotification}
+          <br />
+          <span class="description"><span class="icon email-icon"></span>{ts}A copy of this activity will be emailed to each Assignee.{/ts}</span>
+        {/if}
       </td>
     </tr>
 
@@ -203,6 +196,16 @@
               <td class="label">{$form.followup_activity_subject.label}</td>
               <td>{$form.followup_activity_subject.html|crmAddClass:huge}</td>
             </tr>
+           <tr>
+              <td class="label">
+                {$form.followup_assignee_contact_id.label}
+                {edit}
+                {/edit}
+              </td>
+              <td>
+                {$form.followup_assignee_contact_id.html}
+              </td>
+            </tr>
           </table>
         </div><!-- /.crm-accordion-body -->
       </div><!-- /.crm-accordion-wrapper -->
@@ -212,7 +215,7 @@
     <td class="label">{$form.duration.label}</td>
     <td class="view-value">
       {$form.duration.html}
-      <span class="description">{ts}Total time spent on this activity (in minutes).{/ts}
+      <span class="description">{ts}minutes{/ts}
     </td>
   </tr>
   {* Suppress activity status and priority for changes to status, case type and start date. PostProc will force status to completed. *}
@@ -229,19 +232,8 @@
     {if $form.tag.html}
     <tr class="crm-case-activity-form-block-tag">
       <td class="label">{$form.tag.label}</td>
-      <td class="view-value"><div class="crm-select-container">{$form.tag.html}</div>
-        {literal}
-          <script type="text/javascript">
-            cj(".crm-case-activity-form-block-tag select[multiple]").crmasmSelect({
-              addItemTarget: 'bottom',
-              animate: true,
-              highlight: true,
-              sortable: true,
-              respectParents: true
-            });
-          </script>
-        {/literal}
-
+      <td class="view-value">
+        <div class="crm-select-container">{$form.tag.html}</div>
       </td>
     </tr>
     {/if}
@@ -257,7 +249,7 @@
   {include file="CRM/common/customData.tpl"}
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
     {/literal}
     {if $customDataSubType}
       CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
@@ -286,10 +278,11 @@
   {if $action eq 2 or $action eq 1}
     {literal}
     <script type="text/javascript">
-      cj(function( ) {
+      CRM.$(function($) {
         cj('.crm-with-contact').click(function(){
           cj('#with-contacts-widget').toggle();
           cj('#with-clients').toggle();
+          return false;
         });
       });
     </script>