From 4f6cdd2764f2bbd366fa05fbe22dc3ec73785326 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 28 Oct 2014 10:14:03 +1300
Subject: [PATCH] CRM-15509 move paypal express to its own file for clarity

---
 templates/CRM/Core/BillingBlock.tpl    | 16 ++---------
 templates/CRM/common/paypalexpress.tpl | 39 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 templates/CRM/common/paypalexpress.tpl

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index 8d6b04d4d5..534e6a5ddc 100644
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -31,20 +31,8 @@
       <legend>
         {$paymentTypeLabel}
       </legend>
-      {if $paymentProcessor.billing_mode & 2 and !$hidePayPalExpress }
-        <div class="crm-section no-label paypal_button_info-section">
-          <div class="content description">
-            {ts}If you have a PayPal account, you can click the PayPal button to continue. Otherwise, fill in the credit card and billing information on this form and click
-              <strong>Continue</strong>
-              at the bottom of the page.{/ts}
-          </div>
-        </div>
-        <div class="crm-section no-label {$form.$expressButtonName.name}-section">
-          <div class="content description">
-            {$form.$expressButtonName.html}
-            <div class="description">Save time. Checkout securely. Pay without sharing your financial information.</div>
-          </div>
-        </div>
+      {if $form.$expressButtonName}
+        {include file= "CRM/Core/paypalexpress.tpl"}
       {/if}
       <div class="crm-section billing_mode-section {$paymentTypeName}_info-section">
         {foreach from=$paymentFields item=paymentField}
diff --git a/templates/CRM/common/paypalexpress.tpl b/templates/CRM/common/paypalexpress.tpl
new file mode 100644
index 0000000000..56e99c40f4
--- /dev/null
+++ b/templates/CRM/common/paypalexpress.tpl
@@ -0,0 +1,39 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.5                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*}
+
+<div class="crm-section no-label paypal_button_info-section">
+  <div class="content description">
+    {ts}If you have a PayPal account, you can click the PayPal button to continue. Otherwise, fill in the credit card and billing information on this form and click
+      <strong>Continue</strong>
+      at the bottom of the page.{/ts}
+  </div>
+</div>
+<div class="crm-section no-label {$form.$expressButtonName.name}-section">
+  <div class="content description">
+    {$form.$expressButtonName.html}
+    <div class="description">Save time. Checkout securely. Pay without sharing your financial information.</div>
+  </div>
+</div>
-- 
2.25.1