Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

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

diff --git a/templates/CRM/Contact/Form/CustomData.tpl b/templates/CRM/Contact/Form/CustomData.tpl
index a0cbf755dc52bb333e1769537078c57ead805d6c..807f00a37afb579a950e18a1e94e23606befb165 100644 (file)
--- a/templates/CRM/Contact/Form/CustomData.tpl
+++ b/templates/CRM/Contact/Form/CustomData.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.                                    |
  |                                                                    |
@@ -24,19 +24,10 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for building tabbed custom data *}
-{if $cdType }
+{if $cdType || $postedInfo}
    {include file="CRM/Custom/Form/CustomData.tpl"}
    {if $multiRecordDisplay eq 'single'}
      <div class="html-adjust">{$form.buttons.html}</div>
-     {* for form rule handling *}
-     {include file="CRM/Form/validate.tpl"}
-     {literal}
-     <script type='text/javascript'>
-       cj(function($) {
-         $('#custom-record-dialog .crm-container-snippet #CustomData').validate(CRM.validate.params);
-       });
-     </script>
-     {/literal}
    {/if}
 {else}
     <div id="customData"></div>
@@ -61,4 +52,4 @@
   {/if}
 {/if}
 
-{include file="CRM/Form/attachmentjs.tpl"}
\ No newline at end of file
+{include file="CRM/Form/attachmentjs.tpl"}