http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100185

Revision: 100185
Author:   khorn
Date:     2011-10-18 23:41:29 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Merging the fundraising branch of DonationInterface back into trunk.
Making the hard-coded changes in the DI fundraising branch as well, so I get 
less noise when I try to diff everything. 

Modified Paths:
--------------
    branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
    
branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html
    
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
    
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
    
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php
===================================================================
--- branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php    
2011-10-18 23:29:25 UTC (rev 100184)
+++ branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php    
2011-10-18 23:41:29 UTC (rev 100185)
@@ -111,7 +111,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );
@@ -585,7 +585,7 @@
 
        protected function getPaypalButton() {
                global $wgScriptPath;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '<tr>';
                $form .= '<td class="paypal-button" colspan="2">';

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -280,7 +280,7 @@
                // card logos
                $form .= '<tr>';
                $form .= '<td />';
-               $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' 
=> $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+               $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' 
=> $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                $form .= '</tr>';
 
                // card number

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
 2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
 2011-10-18 23:41:29 UTC (rev 100185)
@@ -83,7 +83,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -118,7 +118,7 @@
                                $form .= Html::hidden( 'PaypalRedirect', 0 );
                                $form .= Xml::tags( 'div',
                                                array(),
-                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif"
 ) ) . '&#160;&#160;&#160;<a href="#" 
onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img
 src="' . $scriptPath . '/donate_with_paypal.gif"/></a>'
+                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos2.gif" ) 
) . '&#160;&#160;&#160;<a href="#" 
onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img
 src="' . $scriptPath . '/donate_with_paypal.gif"/></a>'
                                        );
                                $form .= '</td>';
                                $form .= '</tr>';

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -83,7 +83,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -114,7 +114,7 @@
                                $form .= Html::hidden( 'PaypalRedirect', 0 );
                                $form .= Xml::tags( 'div',
                                                array(),
-                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) )
+                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
                                        );
                                $form .= '</td>';
                                $form .= '</tr>';
@@ -204,7 +204,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -83,7 +83,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -114,7 +114,7 @@
                                $form .= Html::hidden( 'PaypalRedirect', 0 );
                                $form .= Xml::tags( 'div',
                                                array(),
-                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) )
+                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
                                        );
                                $form .= '</td>';
                                $form .= '</tr>';
@@ -204,7 +204,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -83,7 +83,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -114,7 +114,7 @@
                                $form .= Html::hidden( 'PaypalRedirect', 0 );
                                $form .= Xml::tags( 'div',
                                                array(),
-                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) )
+                                               Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
                                        );
                                $form .= '</td>';
                                $form .= '</tr>';
@@ -204,7 +204,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -80,7 +80,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -136,11 +136,11 @@
                $form .= '<tr>';
                $form .= '<td class="label">' . wfMsg( 
'payflowpro_gateway-payment-type' ) . '</td>';
                $form .= '<td>' . 
-                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). 
'</label>' .
-                       Xml::radio( 'card_type', 'cc2', 
$this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" 
) ). '</label>' .
-                       Xml::radio( 'card_type', 'cc3',  
$this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). 
'</label>' .
-                       Xml::radio( 'card_type', 'cc4', 
$this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) 
). '</label>' . 
-                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) 
. '</label>' .
+                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc2', 
$this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc3',  
$this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc4', 
$this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). 
'</label>' . 
+                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . 
'</label>' .
                        '</td>';
                $form .= '</tr>';
                
@@ -241,7 +241,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -80,7 +80,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -130,11 +130,11 @@
                $form .= '<tr>';
                $form .= '<td class="label">' . wfMsg( 
'payflowpro_gateway-payment-type' ) . '</td>';
                $form .= '<td>' . 
-                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). 
'</label>' .
-                       Xml::radio( 'card_type', 'cc2', 
$this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" 
) ). '</label>' .
-                       Xml::radio( 'card_type', 'cc3',  
$this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). 
'</label>' .
-                       Xml::radio( 'card_type', 'cc4', 
$this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) 
). '</label>' . 
-                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) 
. '</label>' .
+                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc2', 
$this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc3',  
$this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). 
'</label>' .
+                       Xml::radio( 'card_type', 'cc4', 
$this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). 
'</label>' . 
+                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . 
'</label>' .
                        '</td>';
                $form .= '</tr>';
                
@@ -257,7 +257,7 @@
                $form = '';
                $form .= Xml::openElement( 'div', array( 'class' => 
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-secure-logos' ) );
-               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
+               $form .= Xml::tags( 'p', array( 'class' => '' ), 
Xml::openElement( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"
 ) ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-addl-info-secure-logos
                $form .= Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-donate-addl-info-text' ) );
                $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 
'payflowpro_gateway-otherways-short' ) );

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -193,7 +193,7 @@
 
        protected function generateBillingFields() {
                global $wgScriptPath, $wgRequest;
-               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
+               $scriptPath = 
"$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
 
                $form = '';
 
@@ -249,13 +249,13 @@
                $form .= '<td class="label""><div style="padding-top:9px;">' . 
wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
                $form .= '<td>' . 
                        '<p style="border: 1px solid rgb(187, 187, 187); float: 
left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 
5px 3px; white-space: nowrap;">'.
-                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). 
'</label>' .
-                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" 
) ). '</label>' .
-                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). 
'</label>' .
-                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) 
). '</label>' . 
+                       Xml::radio( 'card_type', 'cc1', 
$this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 
'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). 
'</label>' .
+                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). 
'</label>' .
+                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). 
'</label>' .
+                       '&#160;<label for="cc1radio">' . Xml::element( 'img', 
array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). 
'</label>' . 
                        '</p>'.
                        '<p style="border: 1px solid transparent; float: left; 
-moz-border-radius: 5px 5px 5px 5px; margin: 0; padding: 5px 5px 5px 3px; 
white-space: nowrap;">'.
-                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) 
. '</label>' .
+                       Xml::radio( 'card_type', 'pp', 
$this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 
'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 
'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . 
'</label>' .
                        '</p>'.
                        '</td>';
                $form .= '</tr>';
@@ -270,7 +270,7 @@
                
                $form .= '<tr>';
                $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 
'payflowpro_gateway-cc-form-header-personal' ) . 
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
                $form .= '</tr>';
                
                // card number
@@ -366,10 +366,10 @@
                        $form = Xml::openElement( 'div', array( 'id' => 
'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
                }
                $form .= Xml::openElement( 'div', array( 'id' => 
'mw-donate-submit-button' ) );
-               $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'onclick' => 
'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'image' ) );
+               $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'onclick' => 
'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'image' ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#mw-donate-submit-button
                $form .= Xml::openElement( 'div', array( 'class' => 
'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation 
will be securely processed.';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be 
securely processed.';
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-submessage
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-form-submit
                
@@ -381,10 +381,10 @@
                }
                $form .= Xml::openElement( 'div', array( 'id' => 
'mw-donate-submit-button' ) );
                $form .= Html::hidden( 'PaypalRedirect', 0 );
-               $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/continue-button.png",
 'alt' => 'Submit donation', 'onclick' => 
'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'image' ) );
+               $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/continue-button.png", 
'alt' => 'Submit donation', 'onclick' => 
'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'image' ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#mw-donate-submit-button
                $form .= Xml::openElement( 'div', array( 'class' => 
'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation 
will be securely processed.';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be 
securely processed.';
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-submessage
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-submit-paypal
                return $form;

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -234,7 +234,7 @@
                // card logos
                $form .= '<tr>';
                $form .= '<td />';
-               $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+               $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                $form .= '</tr>';
 
                // credit card type

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
  2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
  2011-10-18 23:41:29 UTC (rev 100185)
@@ -101,17 +101,17 @@
                // card logos
                if ( $this->form_data[ 'currency' ] == 'USD' ) {
                        $form .= '<tr id="four_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                } else {
                        $form .= '<tr id="four_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                }
 

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
 2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
 2011-10-18 23:41:29 UTC (rev 100185)
@@ -173,10 +173,10 @@
                // submit button
                $form .= Xml::openElement( 'div', array( 'id' => 
'mw-donate-submit-button' ) );
                // $form .= Xml::submitButton( wfMsg( 
'payflowpro_gateway-submit-button' ));
-               $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'type' => 'image' ) );
+               $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'type' => 'image' ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#mw-donate-submit-button
                $form .= Xml::openElement( 'div', array( 'class' => 
'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / 
debit card will be securely processed.';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / debit card 
will be securely processed.';
                $form .= Xml::closeElement( 'div' ); // close 
div#payflowpro_gateway-donate-submessage
                
                $form .= '</td>';
@@ -224,16 +224,16 @@
                
                $form .= '<tr>';
                $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 
'payflowpro_gateway-cc-form-header-personal' ) . 
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
                $form .= '</tr>';
 
                // card logos
                $form .= '<tr>';
                $form .= '<td class="label"> </td>';
                if ( $this->form_data[ 'currency' ] == 'USD' ) {
-                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                } else {
-                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                }
                $form .= '</tr>';
                

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -101,17 +101,17 @@
                // card logos
                if ( $this->form_data[ 'currency' ] == 'USD' ) {
                        $form .= '<tr id="four_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                } else {
                        $form .= '<tr id="four_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                }
 

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
 2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
 2011-10-18 23:41:29 UTC (rev 100185)
@@ -23,7 +23,7 @@
 
                $form .= Xml::openElement( 'div', array( 'id' => 
'premium-confirmation' ) );
                $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), 
wfMsg( 'payflowpro_gateway-tshirt-confirmation' ) );
-               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png",
 'width' => '300', 'height' => '280' ) ) . "<br/>";
+               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/wikipedia-ten-tshirt-front.png",
 'width' => '300', 'height' => '280' ) ) . "<br/>";
                $form .= Xml::openElement( 'div', array( 'id' => 
'premium-values' ) );
                $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' 
) );
                $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 
'size' ).'</span>';
@@ -31,7 +31,7 @@
                $form .= Xml::closeElement( 'div' );  // close div#premium-size
                $form .= wfMsg( 'payflowpro_gateway-on-the-back' ) . "<br/>";
                $form .= Xml::openElement( 'div', array( 'id' => 
'premium-language' ) );
-               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/wordmarks/".$wgRequest->getText(
 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
+               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/wordmarks/".$wgRequest->getText(
 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
                $form .= Xml::closeElement( 'div' );  // close 
div#premium-language
                $form .= Xml::closeElement( 'div' );  // close 
div#premium-values
                $form .= Xml::closeElement( 'div' );  // close 
div#premium-confirmation
@@ -107,17 +107,17 @@
                // card logos
                if ( $this->form_data[ 'currency' ] == 'USD' ) {
                        $form .= '<tr id="four_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                } else {
                        $form .= '<tr id="four_cards" style="display:none;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                        $form .= '<tr id="two_cards" 
style="display:table-row;">';
-                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td class="label"> </td><td>' . Xml::element( 
'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                        $form .= '</tr>';
                }
 

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
       2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
       2011-10-18 23:41:29 UTC (rev 100185)
@@ -122,7 +122,7 @@
                $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 
'valign' => 'top' ) );
 
                $form .= Xml::openElement( 'div', array( 'id' => 
'premium-confirmation' ) );
-               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg",
 'width' => '300', 'height' => '300' ) );
+               $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/Wikipedia-ten-tshirt-back.jpg",
 'width' => '300', 'height' => '300' ) );
                $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', 
$wgRequest->getText( 'size' ) );
                $form .= Xml::closeElement( 'div' );  // close 
div#premium-confirmation
 
@@ -202,16 +202,16 @@
                
                $form .= '<tr>';
                $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 
'payflowpro_gateway-cc-form-header-personal' ) . 
-                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
+                       Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 
'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
                $form .= '</tr>';
 
                // card logos
                $form .= '<tr>';
                $form .= '<td class="label"> </td>';
                if ( $this->form_data[ 'currency' ] == 'USD' ) {
-                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 ) ) . '</td>';
+                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) 
) . '</td>';
                } else {
-                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif"
 ) ) . '</td>';
+                       $form .= '<td>' . Xml::element( 'img', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) 
) . '</td>';
                }
                $form .= '</tr>';
                

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html  
    2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html  
    2011-10-18 23:41:29 UTC (rev 100185)
@@ -58,7 +58,7 @@
                </tr>
                <tr>
                        <td />
-                       <td><img 
src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 /></td>
+                       <td><img 
src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"
 /></td>
                </tr>
                <tr>
                        <td class="label"><label for="card_num">Card 
number</label></td>
@@ -156,7 +156,7 @@
        <input type="hidden" value="@owa_session" name="owa_session" />
        <input type="hidden" value="@owa_ref" name="owa_ref" />
 </form>
-<div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info"><div 
id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img 
src="/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div
 id="payflowpro_gateway-donate-addl-info-text"><p class=""><a 
href="http://wikimediafoundation.org/wiki/Ways_to_Give/en";>Other ways to 
give</a></p><p class="">We do not store your credit card information, and your 
personal data is subject to our <a 
href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy";>privacy 
policy</a>.</p><p class="">Questions or comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a></p></div></div></td></tr></table><div
 class="printfooter">
+<div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info"><div 
id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img 
src="/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div
 id="payflowpro_gateway-donate-addl-info-text"><p class=""><a 
href="http://wikimediafoundation.org/wiki/Ways_to_Give/en";>Other ways to 
give</a></p><p class="">We do not store your credit card information, and your 
personal data is subject to our <a 
href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy";>privacy 
policy</a>.</p><p class="">Questions or comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a></p></div></div></td></tr></table><div
 class="printfooter">
 
 Retrieved from "<a 
href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway";>https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
        
\ No newline at end of file

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -131,12 +131,12 @@
                         </tr>
                         <tr class="step2hidden">
                             <td colspan="2"><h3 class="cc_header">Billing 
information<img
-                                    
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif"
+                                    
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
                                     
style="vertical-align:baseline;margin-left:8px;"/></h3></td>
                         </tr>
                         <tr>
                             <td class="label"></td>
-                            <td><img 
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 style="padding-top: 10px;"/>
+                            <td><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"
 style="padding-top: 10px;"/>
                             </td>
                         </tr>
                         <tr>
@@ -188,8 +188,8 @@
                             <td class="label"></td>
                             <td>
                                 <div id="mw-donate-submit-button"><input  
style="margin-top:19px;"
-                                        
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png"
 alt="Submit donation" type="image"/></div>
-                                <div class="mw-donate-submessage" 
id="payflowpro_gateway-donate-submessage"><img 
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif"
 style="vertical-align:baseline;margin-right:4px;">Your credit / debit card 
will be securely processed.</div>
+                                        
src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
 alt="Submit donation" type="image"/></div>
+                                <div class="mw-donate-submessage" 
id="payflowpro_gateway-donate-submessage"><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
 style="vertical-align:baseline;margin-right:4px;">Your credit / debit card 
will be securely processed.</div>
                             </td>
                         </tr>
                     </table>

Modified: 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
      2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
      2011-10-18 23:41:29 UTC (rev 100185)
@@ -161,14 +161,14 @@
                                                <tr>
                                                        <td colspan="2">
                                                                <h3 
class="cc_header">
-                                                                       Billing 
information <img style="vertical-align:baseline;margin-left:8px;" 
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif">
+                                                                       Billing 
information <img style="vertical-align:baseline;margin-left:8px;" 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif">
                                                                </h3>
                                                        </td>
                                                </tr>
                                                <tr>
                             <td class="label"></td>
                             <td><img
-                                    
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"/>
+                                    
src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"/>
                             </td>
                         </tr>
                         <tr>
@@ -323,9 +323,9 @@
                             <td class="label"></td>
                             <td>
                                 <div 
id="mw-donate-submit-button">&#160;<br/><input
-                                        
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png"
+                                        
src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
                                         alt="Submit donation" 
type="image"/></div>
-                                <div class="mw-donate-submessage" 
id="payflowpro_gateway-donate-submessage"><img 
src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif"
 style="vertical-align:baseline;margin-right:4px;">Your credit / debit card 
will be securely processed.</div>
+                                <div class="mw-donate-submessage" 
id="payflowpro_gateway-donate-submessage"><img 
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
 style="vertical-align:baseline;margin-right:4px;">Your credit / debit card 
will be securely processed.</div>
                             </td>
                         </tr>
                     </table>

Modified: 
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html
===================================================================
--- 
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html
        2011-10-18 23:29:25 UTC (rev 100184)
+++ 
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html
        2011-10-18 23:41:29 UTC (rev 100185)
@@ -58,7 +58,7 @@
                </tr>
                <tr>
                        <td />
-                       <td><img 
src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"
 /></td>
+                       <td><img 
src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"
 /></td>
                </tr>
                <tr>
                        <td class="label"><label for="card_num">Card 
number</label></td>
@@ -156,7 +156,7 @@
        <input type="hidden" value="@owa_session" name="owa_session" />
        <input type="hidden" value="@owa_ref" name="owa_ref" />
 </form>
-<div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info"><div 
id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img 
src="/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div
 id="payflowpro_gateway-donate-addl-info-text"><p class=""><a 
href="http://wikimediafoundation.org/wiki/Ways_to_Give/en";>Other ways to 
give</a></p><p class="">We do not store your credit card information, and your 
personal data is subject to our <a 
href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy";>privacy 
policy</a>.</p><p class="">Questions or comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a></p></div></div></td></tr></table><div
 class="printfooter">
+<div class="payflow-cc-form-section" 
id="payflowpro_gateway-donate-addl-info"><div 
id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img 
src="/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div
 id="payflowpro_gateway-donate-addl-info-text"><p class=""><a 
href="http://wikimediafoundation.org/wiki/Ways_to_Give/en";>Other ways to 
give</a></p><p class="">We do not store your credit card information, and your 
personal data is subject to our <a 
href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy";>privacy 
policy</a>.</p><p class="">Questions or comments? Contact: <a 
href="mailto:[email protected]";>[email protected]</a></p></div></div></td></tr></table><div
 class="printfooter">
 
 Retrieved from "<a 
href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway";>https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
        
\ No newline at end of file


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to