Merge pull request #67 from dpradeep/merge-20140827

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

diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl
index 90864961cab21971e8c9cdf0ed56fcb87e343b8b..04576a92005f5800e0026be95fb640c1554f5189 100644 (file)
--- a/templates/CRM/Case/Form/Case.tpl
+++ b/templates/CRM/Case/Form/Case.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.                                    |
  |                                                                    |
@@ -61,7 +61,8 @@
     </tr>
 {elseif !$clientName and $action eq 1}
     {if $context eq 'standalone'}
-        {include file="CRM/Contact/Form/NewContact.tpl"}
+      <td class="label">{$form.client_id.label}</td>
+      <td class="view-value">{$form.client_id.html}</td>
     {/if}
 {/if}
 {* activity fields *}
@@ -103,7 +104,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>
+         <span class="description">{ts}minutes{/ts}</span>
       </td>
     </tr>
 {/if}
@@ -122,7 +123,7 @@
     </td>
 </tr>
 
-<tr class="crm-case-form-block-tag_set"><td colspan="2">{include file="CRM/common/Tag.tpl" tagsetType='case'}</td></tr>
+<tr class="crm-case-form-block-tag_set"><td colspan="2">{include file="CRM/common/Tagset.tpl" tagsetType='case'}</td></tr>
 
 </table>
 {/if}
@@ -132,8 +133,8 @@
     {include file="CRM/common/customData.tpl"}
     {literal}
       <script type="text/javascript">
-      cj(document).ready(function() {
-           var customDataSubType = cj('#case_type_id').val();
+      CRM.$(function($) {
+           var customDataSubType = $('#case_type_id').val();
            if ( customDataSubType ) {
               CRM.buildCustomData( {/literal}'{$customDataType}'{literal}, customDataSubType );
            } else {
@@ -146,7 +147,5 @@
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 {/if}
 </div>