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 0816b8e3ab81dd2ea5d2d8ec9bbe8afb4e20209e..807f00a37afb579a950e18a1e94e23606befb165 100644 (file)
--- a/templates/CRM/Contact/Form/CustomData.tpl
+++ b/templates/CRM/Contact/Form/CustomData.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,8 +24,11 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for building tabbed custom data *}
-{if $cdType }
-    {include file="CRM/Custom/Form/CustomData.tpl"}
+{if $cdType || $postedInfo}
+   {include file="CRM/Custom/Form/CustomData.tpl"}
+   {if $multiRecordDisplay eq 'single'}
+     <div class="html-adjust">{$form.buttons.html}</div>
+   {/if}
 {else}
     <div id="customData"></div>
     <div class="html-adjust">{$form.buttons.html}</div>
@@ -33,8 +36,7 @@
     {*include custom data js file*}
     {include file="CRM/common/customData.tpl"}
 
-
-  {if $customValueCount }
+  {if $customValueCount}
     {literal}
     <script type="text/javascript">
       var customValueCount = {/literal}"{$customValueCount}"{literal};