r100184 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r100183‎ | r100184 | r100185 >
Date:23:29, 18 October 2011
Author:khorn
Status:ok
Tags:fundraising 
Comment:
Merging the fundraising branch of DonationInterface back into trunk.
Moved the universal css to its universal position, and fixed the hard-coded references to things that moved (mostly images).
As this is a mid-merge commit, the extension will be broken until the merge is completed.
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/Form.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/css/gateway.css (added) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/demo.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test_2.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_1.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_1a.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_2.html (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_2_3step.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css (deleted) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css
——@@ -1,126 +0,0 @@
2 -/* Hide various interface elements */
3 -#left-navigation {
4 - display: none !important;
5 -}
6 -#right-navigation {
7 - display: none !important;
8 -}
9 -#p-search {
10 - display: none !important;
11 -}
12 -#mw-panel div.portal {
13 - display: none !important;
14 -}
15 -body.ltr #footer #footer-places {
16 - display: none !important;
17 -}
18 -
19 -/* Form styling */
20 -.creditcard-error-msg {
21 - color: #cc1100;
22 -}
23 -
24 -.mw-creditcard-donor {
25 - width: 25px;
26 -}
27 -
28 -.mw-donate-submessage {
29 -/* padding-top: 10px; */
30 -}
31 -
32 -#mw-donate-submit-button {
33 -/* padding-top: 10px;
34 - padding-bottom: 10px;
35 - padding-left: 100px;*/
36 -}
37 -
38 -#mw-creditcard {
39 - margin-bottom: 1em;
40 -}
41 -
42 -.payflow-cc-form-section {
43 - float: left;
44 -}
45 -
46 -#payflowpro_gateway-personal-info {
47 - margin-right: 4em;
48 - margin-bottom: 1em;
49 -}
50 -
51 -#payflowpro_gateway-form-submit, #payflowpro_gateway-form-submit-paypal {
52 - margin-top: 1.2em;
53 - text-align: center;
54 - margin-bottom: 1em;
55 -}
56 -
57 -#payflowpro_gateway-donate-addl-info {
58 - margin-top: 4em;
59 - margin-bottom: 4em;
60 - clear: both;
61 -}
62 -
63 -#payflow-table-cc td {
64 - text-align: left;
65 -}
66 -
67 -#payflow-table-donor, #payflow-table-cc, #payflow-table-paypal {
68 - background-color: transparent;
69 -}
70 -
71 -#payflow-table-donor td.label, #payflow-table-comment td.label, #payflow-table-cc td.label {
72 - text-align: right;
73 - display: block;
74 - padding-right: 1em;
75 - width: 94px;
76 -}
77 -
78 -#payflow-table-comment td.check-option {
79 - padding-left: 3em;
80 -}
81 -
82 -#payflow-table-donor td {
83 - text-align: left;
84 -}
85 -
86 -#payflowpro_gateway-donate-addl-info-secure-logos {
87 - float: left;
88 - margin-right: 2em;
89 -}
90 -
91 -.button-plain {
92 - font-size: 1em;
93 - margin-bottom: 0.3em;
94 -}
95 -
96 -.button-navyblue {
97 - background-image:url("https://payments.wikimedia.org/images/0/06/Button-wavy-blue.png");
98 - color:#FFFFFF;
99 - cursor:pointer;
100 -}
101 -
102 -.input-button {
103 - background-color:transparent;
104 - background-repeat:no-repeat;
105 - border:medium none;
106 - font-family:helvetica,impact,sans-serif;
107 - font-size:1.4em;
108 - font-weight:bold;
109 - height:44px;
110 - margin:0;
111 - text-align:center;
112 - vertical-align:middle;
113 - width:204px;
114 -}
115 -
116 -#ca-special {
117 - display: none;
118 -}
119 -
120 -#bodyContent input[type="text"], textarea {
121 - border: 1px solid #C0C0C0;
122 - padding: 3px;
123 -}
124 -
125 -input#fname { width: 110px; margin-right: 4px; }
126 -input#lname { width: 132px; }
127 -input.fullwidth { width: 254px; }
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
——@@ -80,7 +80,7 @@
8181
8282 protected function generateBillingFields() {
8383 global $wgScriptPath, $wgRequest;
84 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 84+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8585
8686 $form = '';
8787
——@@ -136,11 +136,11 @@
137137 $form .= '<tr>';
138138 $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
139139 $form .= '<td>' .
140 - 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>' .
141 - 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>' .
142 - 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>' .
143 - 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>' .
144 - 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>' .
 140+ 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>' .
 141+ 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>' .
 142+ 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>' .
 143+ 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>' .
 144+ 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>' .
145145 '</td>';
146146 $form .= '</tr>';
147147
——@@ -241,7 +241,7 @@
242242 $form = '';
243243 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
244244 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
245 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 245+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
246246 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
247247 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
248248 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
——@@ -80,7 +80,7 @@
8181
8282 protected function generateBillingFields() {
8383 global $wgScriptPath, $wgRequest;
84 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 84+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8585
8686 $form = '';
8787
——@@ -130,11 +130,11 @@
131131 $form .= '<tr>';
132132 $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
133133 $form .= '<td>' .
134 - 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>' .
135 - 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>' .
136 - 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>' .
137 - 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>' .
138 - 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>' .
 134+ 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>' .
 135+ 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>' .
 136+ 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>' .
 137+ 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>' .
 138+ 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>' .
139139 '</td>';
140140 $form .= '</tr>';
141141
——@@ -257,7 +257,7 @@
258258 $form = '';
259259 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
260260 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
261 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 261+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
262262 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
263263 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
264264 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
——@@ -101,17 +101,17 @@
102102 // card logos
103103 if ( $this->form_data[ 'currency' ] == 'USD' ) {
104104 $form .= '<tr id="four_cards" style="display:table-row;">';
105 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 105+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
106106 $form .= '</tr>';
107107 $form .= '<tr id="two_cards" style="display:none;">';
108 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 108+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
109109 $form .= '</tr>';
110110 } else {
111111 $form .= '<tr id="four_cards" style="display:none;">';
112 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 112+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
113113 $form .= '</tr>';
114114 $form .= '<tr id="two_cards" style="display:table-row;">';
115 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 115+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
116116 $form .= '</tr>';
117117 }
118118
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/demo.html
——@@ -58,7 +58,7 @@
5959 </tr>
6060 <tr>
6161 <td />
62 - <td><img src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" /></td>
 62+ <td><img src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" /></td>
6363 </tr>
6464 <tr>
6565 <td class="label"><label for="card_num">Card number</label></td>
——@@ -156,7 +156,7 @@
157157 <input type="hidden" value="@owa_session" name="owa_session" />
158158 <input type="hidden" value="@owa_ref" name="owa_ref" />
159159 </form>
160 -<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:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
 160+<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:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
161161
162162 Retrieved from "<a href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway">https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
163163
\ No newline at end of file
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html
——@@ -131,12 +131,12 @@
132132 </tr>
133133 <tr class="step2hidden">
134134 <td colspan="2"><h3 class="cc_header">Billing information<img
135 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif"
 135+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
136136 style="vertical-align:baseline;margin-left:8px;"/></h3></td>
137137 </tr>
138138 <tr>
139139 <td class="label"></td>
140 - <td><img src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" style="padding-top: 10px;"/>
 140+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" style="padding-top: 10px;"/>
141141 </td>
142142 </tr>
143143 <tr>
——@@ -188,8 +188,8 @@
189189 <td class="label"></td>
190190 <td>
191191 <div id="mw-donate-submit-button"><input style="margin-top:19px;"
192 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png" alt="Submit donation" type="image"/></div>
193 - <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>
 192+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image"/></div>
 193+ <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>
194194 </td>
195195 </tr>
196196 </table>
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test_2.html
——@@ -84,14 +84,14 @@
8585 <tr>
8686 <td colspan="2">
8787 <h3 class="cc_header">
88 - Billing information <img style="vertical-align:baseline;margin-left:8px;" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif">
 88+ Billing information <img style="vertical-align:baseline;margin-left:8px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif">
8989 </h3>
9090 </td>
9191 </tr>
9292 <tr>
9393 <td class="label"></td>
9494 <td><img
95 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"/>
 95+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"/>
9696 </td>
9797 </tr>
9898 <tr>
——@@ -246,9 +246,9 @@
247247 <td class="label"></td>
248248 <td>
249249 <div id="mw-donate-submit-button">&#160;<br/><input
250 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png"
 250+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
251251 alt="Submit donation" type="image"/></div>
252 - <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>
 252+ <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>
253253 </td>
254254 </tr>
255255 </table>
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_2_3step.html
——@@ -127,10 +127,10 @@
128128 <dt><span class="label">Select credit card</span></dt>
129129 <dd class="field" style="margin-bottom: 0;">
130130 <ul class="options-h" id="cards" style="margin: 0;">
131 - <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" /></label></li>
132 - <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" /></label></li>
133 - <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" /></label></li>
134 - <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" /></label></li>
 131+ <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 132+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 133+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 134+ <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
135135 </ul>
136136 <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="Continue" /></div>
137137 </dd>
——@@ -191,7 +191,7 @@
192192 <dt></dt>
193193 <dd class="field">
194194 <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
195 - <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 195+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
196196 </dd>
197197 </dl>
198198 </div>
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_1.html
——@@ -107,10 +107,10 @@
108108 <dt><span class="label">Select credit card</span></dt>
109109 <dd class="field" style="margin-bottom: 0;">
110110 <ul class="options-h" id="cards" style="margin: 0;">
111 - <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" /></label></li>
112 - <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" /></label></li>
113 - <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" /></label></li>
114 - <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" /></label></li>
 111+ <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 112+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 113+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 114+ <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
115115 </ul>
116116 </dd>
117117 </dl>
——@@ -166,7 +166,7 @@
167167 <dt></dt>
168168 <dd class="field">
169169 <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
170 - <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 170+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
171171 </dd>
172172 </dl>
173173 <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_1a.html
——@@ -102,10 +102,10 @@
103103 <dt><span class="label">Select credit card</span></dt>
104104 <dd class="field" style="margin-bottom: 0;">
105105 <ul class="options-h" id="cards" style="margin: 0;">
106 - <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" /></label></li>
107 - <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" /></label></li>
108 - <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" /></label></li>
109 - <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" /></label></li>
 106+ <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 107+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 108+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 109+ <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
110110 </ul>
111111 </dd>
112112 </dl>
——@@ -161,7 +161,7 @@
162162 <dt></dt>
163163 <dd class="field">
164164 <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
165 - <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 165+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
166166 </dd>
167167 </dl>
168168 <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/webitects_2.html
——@@ -113,10 +113,10 @@
114114 <dt><span class="label">Select credit card</span></dt>
115115 <dd class="field" style="margin-bottom: 0;">
116116 <ul class="options-h" id="cards" style="margin: 0;">
117 - <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" /></label></li>
118 - <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" /></label></li>
119 - <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" /></label></li>
120 - <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" /></label></li>
 117+ <li><input id="cc-visa" name="cardtype" type="radio" value="Visa" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li>
 118+ <li><input id="cc-mastercard" name="cardtype" type="radio" value="MasterCard" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li>
 119+ <li><input id="cc-amex" name="cardtype" type="radio" value="American Express" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
 120+ <li><input id="cc-discover" name="cardtype" type="radio" value="Discover" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>
121121 </ul>
122122 </dd>
123123 </dl>
——@@ -173,7 +173,7 @@
174174 <dt></dt>
175175 <dd class="field">
176176 <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
177 - <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 177+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
178178 </dd>
179179 </dl>
180180 <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
——@@ -193,7 +193,7 @@
194194
195195 protected function generateBillingFields() {
196196 global $wgScriptPath, $wgRequest;
197 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 197+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
198198
199199 $form = '';
200200
——@@ -249,13 +249,13 @@
250250 $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
251251 $form .= '<td>' .
252252 '<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;">'.
253 - 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>' .
254 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
255 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
256 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
 253+ 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>' .
 254+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
 255+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). '</label>' .
 256+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). '</label>' .
257257 '</p>'.
258258 '<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;">'.
259 - 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>' .
 259+ 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>' .
260260 '</p>'.
261261 '</td>';
262262 $form .= '</tr>';
——@@ -270,7 +270,7 @@
271271
272272 $form .= '<tr>';
273273 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
274 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 274+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
275275 $form .= '</tr>';
276276
277277 // card number
——@@ -366,10 +366,10 @@
367367 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
368368 }
369369 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
370 - $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' ) );
 370+ $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' ) );
371371 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
372372 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
373 - 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.';
 373+ 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.';
374374 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
375375 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
376376
——@@ -381,10 +381,10 @@
382382 }
383383 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
384384 $form .= Html::hidden( 'PaypalRedirect', 0 );
385 - $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' ) );
 385+ $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' ) );
386386 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
387387 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
388 - 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.';
 388+ 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.';
389389 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
390390 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-submit-paypal
391391 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
——@@ -101,17 +101,17 @@
102102 // card logos
103103 if ( $this->form_data[ 'currency' ] == 'USD' ) {
104104 $form .= '<tr id="four_cards" style="display:table-row;">';
105 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 105+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
106106 $form .= '</tr>';
107107 $form .= '<tr id="two_cards" style="display:none;">';
108 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 108+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
109109 $form .= '</tr>';
110110 } else {
111111 $form .= '<tr id="four_cards" style="display:none;">';
112 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 112+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
113113 $form .= '</tr>';
114114 $form .= '<tr id="two_cards" style="display:table-row;">';
115 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 115+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
116116 $form .= '</tr>';
117117 }
118118
Index: trunk/extensions/DonationInterface/gateway_forms/css/gateway.css
——@@ -0,0 +1,126 @@
 2+/* Hide various interface elements */
 3+#left-navigation {
 4+ display: none !important;
 5+}
 6+#right-navigation {
 7+ display: none !important;
 8+}
 9+#p-search {
 10+ display: none !important;
 11+}
 12+#mw-panel div.portal {
 13+ display: none !important;
 14+}
 15+body.ltr #footer #footer-places {
 16+ display: none !important;
 17+}
 18+
 19+/* Form styling */
 20+.creditcard-error-msg {
 21+ color: #cc1100;
 22+}
 23+
 24+.mw-creditcard-donor {
 25+ width: 25px;
 26+}
 27+
 28+.mw-donate-submessage {
 29+/* padding-top: 10px; */
 30+}
 31+
 32+#mw-donate-submit-button {
 33+/* padding-top: 10px;
 34+ padding-bottom: 10px;
 35+ padding-left: 100px;*/
 36+}
 37+
 38+#mw-creditcard {
 39+ margin-bottom: 1em;
 40+}
 41+
 42+.payflow-cc-form-section {
 43+ float: left;
 44+}
 45+
 46+#payflowpro_gateway-personal-info {
 47+ margin-right: 4em;
 48+ margin-bottom: 1em;
 49+}
 50+
 51+#payflowpro_gateway-form-submit, #payflowpro_gateway-form-submit-paypal {
 52+ margin-top: 1.2em;
 53+ text-align: center;
 54+ margin-bottom: 1em;
 55+}
 56+
 57+#payflowpro_gateway-donate-addl-info {
 58+ margin-top: 4em;
 59+ margin-bottom: 4em;
 60+ clear: both;
 61+}
 62+
 63+#payflow-table-cc td {
 64+ text-align: left;
 65+}
 66+
 67+#payflow-table-donor, #payflow-table-cc, #payflow-table-paypal {
 68+ background-color: transparent;
 69+}
 70+
 71+#payflow-table-donor td.label, #payflow-table-comment td.label, #payflow-table-cc td.label {
 72+ text-align: right;
 73+ display: block;
 74+ padding-right: 1em;
 75+ width: 94px;
 76+}
 77+
 78+#payflow-table-comment td.check-option {
 79+ padding-left: 3em;
 80+}
 81+
 82+#payflow-table-donor td {
 83+ text-align: left;
 84+}
 85+
 86+#payflowpro_gateway-donate-addl-info-secure-logos {
 87+ float: left;
 88+ margin-right: 2em;
 89+}
 90+
 91+.button-plain {
 92+ font-size: 1em;
 93+ margin-bottom: 0.3em;
 94+}
 95+
 96+.button-navyblue {
 97+ background-image:url("https://payments.wikimedia.org/images/0/06/Button-wavy-blue.png");
 98+ color:#FFFFFF;
 99+ cursor:pointer;
 100+}
 101+
 102+.input-button {
 103+ background-color:transparent;
 104+ background-repeat:no-repeat;
 105+ border:medium none;
 106+ font-family:helvetica,impact,sans-serif;
 107+ font-size:1.4em;
 108+ font-weight:bold;
 109+ height:44px;
 110+ margin:0;
 111+ text-align:center;
 112+ vertical-align:middle;
 113+ width:204px;
 114+}
 115+
 116+#ca-special {
 117+ display: none;
 118+}
 119+
 120+#bodyContent input[type="text"], textarea {
 121+ border: 1px solid #C0C0C0;
 122+ padding: 3px;
 123+}
 124+
 125+input#fname { width: 110px; margin-right: 4px; }
 126+input#lname { width: 132px; }
 127+input.fullwidth { width: 254px; }
Property changes on: trunk/extensions/DonationInterface/gateway_forms/css/gateway.css
___________________________________________________________________
Added: svn:eol-style
1128 + native
Index: trunk/extensions/DonationInterface/gateway_forms/Form.php
——@@ -123,7 +123,7 @@
124124 $form = '';
125125 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
126126 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
127 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 127+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
128128 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
129129 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
130130 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
——@@ -605,7 +605,7 @@
606606
607607 protected function getPaypalButton() {
608608 global $wgScriptPath;
609 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 609+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
610610
611611 $form = '<tr>';
612612 $form .= '<td class="paypal-button" colspan="2">';
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -118,7 +118,7 @@
119119 $form .= Html::hidden( 'PaypalRedirect', 0 );
120120 $form .= Xml::tags( 'div',
121121 array(),
122 - 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>'
 122+ 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>'
123123 );
124124 $form .= '</td>';
125125 $form .= '</tr>';
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
——@@ -23,7 +23,7 @@
2424
2525 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
2626 $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), wfMsg( 'payflowpro_gateway-tshirt-confirmation' ) );
27 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
 27+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
2828 $form .= Xml::openElement( 'div', array( 'id' => 'premium-values' ) );
2929 $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' ) );
3030 $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 'size' ).'</span>';
——@@ -31,7 +31,7 @@
3232 $form .= Xml::closeElement( 'div' ); // close div#premium-size
3333 $form .= wfMsg( 'payflowpro_gateway-on-the-back' ) . "<br/>";
3434 $form .= Xml::openElement( 'div', array( 'id' => 'premium-language' ) );
35 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/wordmarks/".$wgRequest->getText( 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
 35+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wordmarks/".$wgRequest->getText( 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
3636 $form .= Xml::closeElement( 'div' ); // close div#premium-language
3737 $form .= Xml::closeElement( 'div' ); // close div#premium-values
3838 $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
——@@ -107,17 +107,17 @@
108108 // card logos
109109 if ( $this->form_data[ 'currency' ] == 'USD' ) {
110110 $form .= '<tr id="four_cards" style="display:table-row;">';
111 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 111+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
112112 $form .= '</tr>';
113113 $form .= '<tr id="two_cards" style="display:none;">';
114 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 114+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
115115 $form .= '</tr>';
116116 } else {
117117 $form .= '<tr id="four_cards" style="display:none;">';
118 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 118+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
119119 $form .= '</tr>';
120120 $form .= '<tr id="two_cards" style="display:table-row;">';
121 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 121+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
122122 $form .= '</tr>';
123123 }
124124
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
——@@ -167,7 +167,7 @@
168168 // card logos
169169 $form .= '<tr>';
170170 $form .= '<td />';
171 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 171+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
172172 $form .= '</tr>';
173173
174174 // credit card type
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
——@@ -169,10 +169,10 @@
170170 // submit button
171171 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
172172 // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' ));
173 - $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) );
 173+ $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) );
174174 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
175175 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
176 - 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.';
 176+ 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.';
177177 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
178178
179179 $form .= '</td>';
——@@ -220,16 +220,16 @@
221221
222222 $form .= '<tr>';
223223 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
224 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 224+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
225225 $form .= '</tr>';
226226
227227 // card logos
228228 $form .= '<tr>';
229229 $form .= '<td class="label"> </td>';
230230 if ( $this->form_data[ 'currency' ] == 'USD' ) {
231 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 231+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
232232 } else {
233 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 233+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
234234 }
235235 $form .= '</tr>';
236236
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
——@@ -122,7 +122,7 @@
123123 $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
124124
125125 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
126 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
 126+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
127127 $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $wgRequest->getText( 'size' ) );
128128 $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
129129
——@@ -202,16 +202,16 @@
203203
204204 $form .= '<tr>';
205205 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
206 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 206+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
207207 $form .= '</tr>';
208208
209209 // card logos
210210 $form .= '<tr>';
211211 $form .= '<td class="label"> </td>';
212212 if ( $this->form_data[ 'currency' ] == 'USD' ) {
213 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 213+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
214214 } else {
215 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 215+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
216216 }
217217 $form .= '</tr>';
218218
Index: trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
——@@ -280,7 +280,7 @@
281281 // card logos
282282 $form .= '<tr>';
283283 $form .= '<td />';
284 - $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 284+ $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
285285 $form .= '</tr>';
286286
287287 // card number
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html
——@@ -58,7 +58,7 @@
5959 </tr>
6060 <tr>
6161 <td />
62 - <td><img src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" /></td>
 62+ <td><img src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" /></td>
6363 </tr>
6464 <tr>
6565 <td class="label"><label for="card_num">Card number</label></td>
——@@ -156,7 +156,7 @@
157157 <input type="hidden" value="@owa_session" name="owa_session" />
158158 <input type="hidden" value="@owa_ref" name="owa_ref" />
159159 </form>
160 -<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:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
 160+<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:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
161161
162162 Retrieved from "<a href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway">https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
163163
\ No newline at end of file

Status & tagging log