From 540ea9be2657bdf6e2cfe2b58cca36aae1611171 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 30 Sep 2014 15:37:44 -0400
Subject: [PATCH] CRM-15394 - Fix credit card contribution link

---
 .../CRM/Contribute/Form/AdditionalPayment.tpl  | 18 ++++++++++--------
 templates/CRM/Contribute/Form/Contribution.tpl |  8 +++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index c68372fb1c..b8ef319c5c 100644
--- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -73,16 +73,18 @@
     <div class="icon inform-icon"></div>&nbsp;{ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
   </div>
   {/if}
+  {if $newCredit AND $contributionMode EQ null}
+    {if $contactId}
+      {capture assign=ccModeLink}{crmURL p='civicrm/payment/add' q="reset=1&action=add&cid=`$contactId`&id=`$id`&component=`$component`&mode=live"}{/capture}
+    {/if}
+    {if $paymentType eq 'owed'}
+      <div class="action-link css_right crm-link-credit-card-mode">
+        <a class="open-inline crm-hover-button" href="{$ccModeLink}">&raquo; {ts}submit credit card payment{/ts}</a>
+      </div>
+    {/if}
+  {/if}
   <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl"}
-    {if $newCredit AND $contributionMode EQ null}
-      {if $contactId}
-        {capture assign=ccModeLink}{crmURL p='civicrm/payment/add' q="reset=1&action=add&cid=`$contactId`&id=`$id`&component=`$component`&mode=live"}{/capture}
-       {/if}
-      {if $paymentType eq 'owed'}
-        <span class="action-link crm-link-credit-card-mode">&nbsp;<a class="open-inline crm-hover-button" href="{$ccModeLink}">&raquo; {ts}submit credit card payment{/ts}</a></span>
-      {/if}
-    {/if}
   </div>
   <table class="form-layout-compressed">    
     <tr>
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index b18562fccc..c7f3e1d1ae 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -61,16 +61,18 @@
     {ts}WARNING: Deleting this contribution will result in the loss of the associated financial transactions (if any).{/ts} {ts}Do you want to continue?{/ts}
   </div>
   {else}
-  <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl"}
     {if $newCredit AND $action EQ 1 AND $contributionMode EQ null}
+    <div class="action-link css_right crm-link-credit-card-mode">
       {if $contactId}
         {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&cid=`$contactId`&context=`$context`&mode=live"}{/capture}
       {else}
         {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&context=standalone&mode=live"}{/capture}
       {/if}
-      <span class="action-link crm-link-credit-card-mode">&nbsp;<a class="open-inline crm-hover-button action-item" href="{$ccModeLink}">&raquo; {ts}submit credit card contribution{/ts}</a></span>
+     <a class="open-inline crm-hover-button action-item" href="{$ccModeLink}">&raquo; {ts}submit credit card contribution{/ts}</a>
+    </div>
     {/if}
+  <div class="crm-submit-buttons">
+    {include file="CRM/common/formButtons.tpl"}
   </div>
   {if $isOnline}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if}
   <table class="form-layout-compressed">
-- 
2.25.1