From d20225bb67e939270a1b285d9b5ae9b0da117507 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 2 Dec 2013 15:29:39 -0800
Subject: [PATCH] CRM-13880 - Update payment instrument help text

---
 templates/CRM/Contribute/Form/Contribution.tpl  |  3 +--
 templates/CRM/Contribute/Page/Tab.hlp           | 12 ++++++++++++
 templates/CRM/Event/Form/EventFees.tpl          |  2 +-
 templates/CRM/Member/Form/Membership.tpl        |  2 +-
 templates/CRM/Member/Form/MembershipRenewal.tpl |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 5e231515ae..7461727feb 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -298,8 +298,7 @@
           </tr>
           <tr class="crm-contribution-form-block-payment_instrument_id">
             <td class="label">{$form.payment_instrument_id.label}</td>
-            <td {$valueStyle}>{$form.payment_instrument_id.html}<br />
-              <span class="description">{ts}Leave blank for non-monetary contributions.{/ts}</span>
+            <td {$valueStyle}>{$form.payment_instrument_id.html} {help id="payment_instrument_id"}</td>
             </td>
           </tr>
           {if $showCheckNumber || !$isOnline}
diff --git a/templates/CRM/Contribute/Page/Tab.hlp b/templates/CRM/Contribute/Page/Tab.hlp
index 8217994cd5..5f01073387 100644
--- a/templates/CRM/Contribute/Page/Tab.hlp
+++ b/templates/CRM/Contribute/Page/Tab.hlp
@@ -37,6 +37,18 @@
 {ts}Select the appropriate financial type for this transaction.{/ts}
 {/htxt}
 
+{htxt id="payment_instrument_id-title"}
+  {ts}Payment Instrument{/ts}
+{/htxt}
+{htxt id="payment_instrument_id"}
+  <p>
+    {ts}Choose the method by which this transaction was paid.{/ts}
+  </p><p>
+    {ts}Note: if the correct payment instrument is not listed here (e.g. for in-kind donations) ask your administrator to add a new option to this list.{/ts}
+  </p>
+
+{/htxt}
+
 {htxt id="id-trans_id-title"}
   {ts}Transaction ID{/ts}
 {/htxt}
diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl
index 6d7205dd88..bcd86c041a 100644
--- a/templates/CRM/Event/Form/EventFees.tpl
+++ b/templates/CRM/Event/Form/EventFees.tpl
@@ -81,7 +81,7 @@
                     <td class="label" >{$form.receive_date.label}</td>
                     <td>{include file="CRM/common/jcalendar.tpl" elementName=receive_date}</td>
                 </tr>
-                <tr class="crm-event-eventfees-form-block-payment_instrument_id"><td class="label">{$form.payment_instrument_id.label}<span class="marker"> *</span></td><td>{$form.payment_instrument_id.html}</td></tr>
+                <tr class="crm-event-eventfees-form-block-payment_instrument_id"><td class="label">{$form.payment_instrument_id.label}<span class="marker"> *</span></td><td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td></tr>
                 <tr id="checkNumber" class="crm-event-eventfees-form-block-check_number"><td class="label">{$form.check_number.label}</td><td>{$form.check_number.html|crmAddClass:six}</td></tr>
                 {if $showTransactionId }
                     <tr class="crm-event-eventfees-form-block-trxn_id"><td class="label">{$form.trxn_id.label}</td><td>{$form.trxn_id.html}</td></tr>
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index fbec9ca070..e4cdec27e9 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -243,7 +243,7 @@
                 </tr>
                 <tr class="crm-membership-form-block-payment_instrument_id">
                   <td class="label">{$form.payment_instrument_id.label}<span class="marker"> *</span></td>
-                  <td>{$form.payment_instrument_id.html}</td>
+                  <td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td>
                 </tr>
                 <tr id="checkNumber" class="crm-membership-form-block-check_number">
                   <td class="label">{$form.check_number.label}</td>
diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl
index 2068debe73..217fb1c763 100644
--- a/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -167,7 +167,7 @@
                 </tr>
                 <tr class="crm-member-membershiprenew-form-block-payment_instrument_id">
                   <td class="label">{$form.payment_instrument_id.label}<span class='marker'>*</span></td>
-                  <td>{$form.payment_instrument_id.html}</td>
+                  <td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td>
                 </tr>
                 <tr id="checkNumber" class="crm-member-membershiprenew-form-block-check_number">
                   <td class="label">{$form.check_number.label}</td>
-- 
2.25.1