Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-30-11-58-01

[civicrm-core.git] / templates / CRM / Contact / Page / View / CustomDataFieldView.tpl

diff --git a/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl b/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
index 9b70a60cb0bf154ded44502ce1f8b0b1b41b96bc..4acadbe4ec2e16e56f97e5d51b86cc87e5cf1dcc 100644 (file)
--- a/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
+++ b/templates/CRM/Contact/Page/View/CustomDataFieldView.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.                                    |
  |                                                                    |
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div id="custom-set-content-{$customGroupId}" {if $permission EQ 'edit'} class="crm-inline-edit" data-edit-params='{ldelim}"cid": "{$contactId}", "class_name": "CRM_Contact_Form_Inline_CustomData", "groupID": "{$customGroupId}"{rdelim}'{/if}>
+<div id="custom-set-content-{$customGroupId}" {if $permission EQ 'edit'} class="crm-inline-edit" data-edit-params='{ldelim}"cid": "{$contactId}", "class_name": "CRM_Contact_Form_Inline_CustomData", "groupID": "{$customGroupId}", "customRecId": "{$customRecId}", "cgcount" : "{$cgcount}"{rdelim}'{/if}>
   <div class="crm-clear crm-inline-block-content" {if $permission EQ 'edit'}title="{ts}Edit{/ts}"{/if}>
     {if $permission EQ 'edit'}
       <div class="crm-edit-help">
@@ -46,7 +46,10 @@
           {if $element.field_type == 'File'}
             {if $element.field_value.displayURL}
                 <div class="crm-content crm-custom_data crm-displayURL">
-                  <a href="#" onclick="imagePopUp('{$element.field_value.imageURL}'); return false;" ><img src="{$element.field_value.displayURL}" height = "{$element.field_value.imageThumbHeight}" width="{$element.field_value.imageThumbWidth}"></a>
+                  <a href="{$element.field_value.displayURL}" class='crm-image-popup'>
+                    <img src="{$element.field_value.displayURL}" height = "{$element.field_value.imageThumbHeight}"
+                         width="{$element.field_value.imageThumbWidth}">
+                  </a>
                 </div>
             {else}
                 <div class="crm-content crm-custom_data crm-fileURL">