Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186377
Change subject: Kill PayflowPro, part 2
......................................................................
Kill PayflowPro, part 2
Rename classes and ids in HTML and CSS
Bug: T86262
Change-Id: I3ede5d9565004fc9d9a9632a410cf935f4adf77b
---
M adyen_gateway/forms/css/adyen.css
M adyen_gateway/forms/html/adyen.html
M amazon_gateway/forms/html/amazon-recurring.html
M amazon_gateway/forms/html/amazon.html
M gateway_forms/Form.php
M gateway_forms/css/TwoStepTwoColumnLetter.css
M gateway_forms/rapidhtml/css/webitects.css
M globalcollect_gateway/forms/css/gc.css
M globalcollect_gateway/forms/html/bt/bt.html
M globalcollect_gateway/forms/html/cash/boletos.html
M globalcollect_gateway/forms/html/cc/cc-a.html
M globalcollect_gateway/forms/html/cc/cc-vm.html
M globalcollect_gateway/forms/html/cc/cc-vma.html
M globalcollect_gateway/forms/html/cc/cc-vmad.html
M globalcollect_gateway/forms/html/cc/cc-vmaj.html
M globalcollect_gateway/forms/html/cc/cc-vmd.html
M globalcollect_gateway/forms/html/cc/cc-vmj.html
M globalcollect_gateway/forms/html/cc/cc.html
M globalcollect_gateway/forms/html/dd/dd-recurring.html
M globalcollect_gateway/forms/html/dd/dd.html
M globalcollect_gateway/forms/html/ew/ew-alipay.html
M globalcollect_gateway/forms/html/ew/ew-webmoney.html
M globalcollect_gateway/forms/html/ew/ew-yandex.html
M globalcollect_gateway/forms/html/lightbox1.html
M globalcollect_gateway/forms/html/obt/obt-bpay.html
M globalcollect_gateway/forms/html/rcc/rcc-vm.html
M globalcollect_gateway/forms/html/rcc/rcc-vma.html
M globalcollect_gateway/forms/html/rcc/rcc-vmad.html
M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
M globalcollect_gateway/forms/html/rcc/rcc-vmd.html
M globalcollect_gateway/forms/html/rcc/rcc-vmj.html
M globalcollect_gateway/forms/html/rcc/rcc.html
M modules/css/gateway.css
M modules/validate_input.js
M paypal_gateway/forms/html/paypal-recurring.html
M paypal_gateway/forms/html/paypal.html
M tests/Gateway_FormTest.php
M worldpay_gateway/forms/css/worldpay.css
M worldpay_gateway/forms/html/worldpay-dd-test.html
M worldpay_gateway/forms/html/worldpay-test.html
M worldpay_gateway/forms/html/worldpay.html
41 files changed, 169 insertions(+), 171 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/77/186377/1
diff --git a/adyen_gateway/forms/css/adyen.css
b/adyen_gateway/forms/css/adyen.css
index 07ddc5f..d8d4937 100644
--- a/adyen_gateway/forms/css/adyen.css
+++ b/adyen_gateway/forms/css/adyen.css
@@ -19,16 +19,16 @@
margin-bottom: 0;
font-weight: normal;
}
-div#payflowpro_gateway-donate-addl-info-text {
+div#payment_gateway-donate-addl-info-text {
font-size: 90%;
line-height: 120%;
padding-top: 12px;
}
-div#payflowpro_gateway-donate-submessage {
+div#payment_gateway-donate-submessage {
font-size: 90%;
line-height: 120%;
}
-#payflow-table-donor td.label, #payflow-table-comment td.label,
#payflow-table-cc td.label {
+#payment-table-donor td.label, #payment-table-comment td.label,
#payment-table-cc td.label {
white-space: nowrap;
display: block;
padding-right: 1em;
@@ -37,17 +37,17 @@
}
-.payflow-cc-form-section {
+.payment-cc-form-section {
float: none;
margin-right: 0em;
margin-bottom: 1em;
}
-#payflowpro_gateway-cc_form_container {
+#payment_gateway-cc_form_container {
width: 100%;
}
-#payflowpro_gateway-cc_form_form {
+#payment_gateway-cc_form_form {
width: 475px;
float: right;
margin-left: 2em;
@@ -55,33 +55,33 @@
border-left: 1px solid #BBBBBB;
}
-#payflowpro_gateway-cc_form_letter {
+#payment_gateway-cc_form_letter {
height: 100%;
}
-#payflowpro_gateway-cc_form_letter p {
+#payment_gateway-cc_form_letter p {
font-size: 1.125em;
margin-bottom: 1.2em;
}
-#payflowpro_gateway-personal-info {
+#payment_gateway-personal-info {
margin-right:0 !important;
}
-#payflowpro_gateway-donate-addl-info-secure-logos {
+#payment_gateway-donate-addl-info-secure-logos {
float: left;
margin-right: 2em;
}
-#payflowpro_gateway-cc_form_letter_inside {
+#payment_gateway-cc_form_letter_inside {
padding-top: .5em;
}
-#payflowpro_gateway-cc_otherways {
+#payment_gateway-cc_otherways {
padding-top: .5em;
display: block;
}
-#payflowpro_gateway-donate-addl-info {
+#payment_gateway-donate-addl-info {
margin-top:2em !important;
margin-bottom:1em !important;
}
@@ -166,7 +166,7 @@
font-weight: normal;
}
-table#payflow-table-donor{
+table#payment-table-donor{
/*margin-left: 10px;*/
}
diff --git a/adyen_gateway/forms/html/adyen.html
b/adyen_gateway/forms/html/adyen.html
index beb1e0a..e83d213 100644
--- a/adyen_gateway/forms/html/adyen.html
+++ b/adyen_gateway/forms/html/adyen.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td colspan="2">
@@ -47,7 +47,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
diff --git a/amazon_gateway/forms/html/amazon-recurring.html
b/amazon_gateway/forms/html/amazon-recurring.html
index 6e9b158..90d549a 100644
--- a/amazon_gateway/forms/html/amazon-recurring.html
+++ b/amazon_gateway/forms/html/amazon-recurring.html
@@ -26,8 +26,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td colspan="2">
diff --git a/amazon_gateway/forms/html/amazon.html
b/amazon_gateway/forms/html/amazon.html
index 2a1cdc5..3550734 100644
--- a/amazon_gateway/forms/html/amazon.html
+++ b/amazon_gateway/forms/html/amazon.html
@@ -26,8 +26,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td colspan="2">
diff --git a/gateway_forms/Form.php b/gateway_forms/Form.php
index 71c288f..8147838 100644
--- a/gateway_forms/Form.php
+++ b/gateway_forms/Form.php
@@ -27,7 +27,7 @@
public $form_id = 'payment';
/**
- * An array of form errors, passed from the payflow pro object
+ * An array of form errors, passed from the gateway page object
* @var array
*/
public $form_errors;
@@ -91,8 +91,8 @@
public function generateDonationFooter() {
global $wgExtensionAssetsPath, $wgServer;
$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::openElement( 'div', array( 'class' =>
'payment-cc-form-section', 'id' => 'payment_gateway-donate-addl-info' ) );
+ $form .= Xml::openElement( 'div', array( 'id' =>
'payment_gateway-donate-addl-info-secure-logos' ) );
// @codeCoverageIgnoreStart
if ($wgServer =="https://payments.wikimedia.org";) {
@@ -101,13 +101,13 @@
// @codeCoverageIgnoreEnd
$form .= Xml::tags( 'p', array( 'class' => '' ),
Xml::openElement( 'img', array( 'src' => $wgExtensionAssetsPath .
"/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::closeElement( 'div' ); // close
div#payment_gateway-donate-addl-info-secure-logos
+ $form .= Xml::openElement( 'div', array( 'id' =>
'payment_gateway-donate-addl-info-text' ) );
$form .= Xml::tags( 'p', array( 'class' => '' ), wfMessage(
'donate_interface-otherways-short' )->text() );
$form .= Xml::tags( 'p', array( 'class' => '' ), wfMessage(
'donate_interface-informationsharing' )->text() );
$form .= Xml::tags( 'p', array( 'class' => '' ), wfMessage(
'donate_interface-question-comment' )->text() );
- $form .= Xml::closeElement( 'div' ); // close
div#payflowpro_gateway-donate-addl-info-text
- $form .= Xml::closeElement( 'div' ); // close
div#payflowpro_gateway-donate-addl-info
+ $form .= Xml::closeElement( 'div' ); // close
div#payment_gateway-donate-addl-info-text
+ $form .= Xml::closeElement( 'div' ); // close
div#payment_gateway-donate-addl-info
return $form;
}
diff --git a/gateway_forms/css/TwoStepTwoColumnLetter.css
b/gateway_forms/css/TwoStepTwoColumnLetter.css
index 4860bc2..5378881 100644
--- a/gateway_forms/css/TwoStepTwoColumnLetter.css
+++ b/gateway_forms/css/TwoStepTwoColumnLetter.css
@@ -1,14 +1,14 @@
-.payflow-cc-form-section {
+.payment-cc-form-section {
float: none;
margin-right: 0;
margin-bottom: 1em;
}
-#payflowpro_gateway-cc_form_container {
+#payment_gateway-cc_form_container {
width: 100%;
}
-#payflowpro_gateway-cc_form_form {
+#payment_gateway-cc_form_form {
width: 475px;
float: right;
margin-left: 2em;
@@ -16,33 +16,33 @@
border-left: 1px solid #BBBBBB;
}
-#payflowpro_gateway-cc_form_letter {
+#payment_gateway-cc_form_letter {
height: 100%;
}
-#payflowpro_gateway-cc_form_letter p {
+#payment_gateway-cc_form_letter p {
font-size: 1.125em;
margin-bottom: 1.2em;
}
-#payflowpro_gateway-personal-info {
+#payment_gateway-personal-info {
margin-right:0 !important;
}
-#payflowpro_gateway-donate-addl-info-secure-logos {
+#payment_gateway-donate-addl-info-secure-logos {
float: left;
margin-right: 2em;
}
-#payflowpro_gateway-cc_form_letter_inside {
+#payment_gateway-cc_form_letter_inside {
padding-top: .5em;
}
-#payflowpro_gateway-cc_otherways {
+#payment_gateway-cc_otherways {
padding-top: .5em;
display: block;
}
-#payflowpro_gateway-donate-addl-info {
+#payment_gateway-donate-addl-info {
margin-top:3em !important;
margin-bottom:1em !important;
}
diff --git a/gateway_forms/rapidhtml/css/webitects.css
b/gateway_forms/rapidhtml/css/webitects.css
index bfb4ef4..1ff771f 100644
--- a/gateway_forms/rapidhtml/css/webitects.css
+++ b/gateway_forms/rapidhtml/css/webitects.css
@@ -16,12 +16,10 @@
.call-l { float: left; margin: 0.2em 1em 1em 0; }
.call-l, .call-r { background: #fff; border: 1px solid #444; font-size: 13px;
padding: 15px 20px; }
.call-l h3, .call-r h3 { font-size: 17px; }
-.call-l .loading, .call-r .loading { background-image:
url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif);
}
.call-r { float: right; margin: 0.2em 0 1em 1em; }
/* Loading */
#loading { font-size: 12px; margin-left: 0.5em; vertical-align: middle; }
-.loading { background:
url(https://payments.wikimedia.org/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-green.gif)
no-repeat 50% 50%; padding: 10px; }
/* Muted text */
.mute { font-size: 12px; }
diff --git a/globalcollect_gateway/forms/css/gc.css
b/globalcollect_gateway/forms/css/gc.css
index e41373d..40229cf 100644
--- a/globalcollect_gateway/forms/css/gc.css
+++ b/globalcollect_gateway/forms/css/gc.css
@@ -1,34 +1,34 @@
-div#payflowpro_gateway-donate-addl-info-text {
+div#payment_gateway-donate-addl-info-text {
font-size: 90%;
line-height: 120%;
padding-top: 12px;
}
-div#payflowpro_gateway-donate-submessage {
+div#payment_gateway-donate-submessage {
font-size: 90%;
line-height: 120%;
}
-#payflow-table-donor td.label, #payflow-table-comment td.label,
#payflow-table-cc td.label {
+#payment-table-donor td.label, #payment-table-comment td.label,
#payment-table-cc td.label {
white-space: nowrap;
display: block;
padding-right: 1em;
text-align: right;
width: 94px;
}
-.payflow-cc-form-section {
+.payment-cc-form-section {
float: none;
margin-right: 0;
margin-bottom: 1em;
}
-#payflowpro_gateway-personal-info {
+#payment_gateway-personal-info {
margin-right:0 !important;
}
-#payflowpro_gateway-donate-addl-info-secure-logos {
+#payment_gateway-donate-addl-info-secure-logos {
float: left;
margin-right: 2em;
}
-#payflowpro_gateway-donate-addl-info {
+#payment_gateway-donate-addl-info {
margin-top:2em !important;
margin-bottom:1em !important;
}
@@ -93,7 +93,7 @@
list-style: none !important;
list-style-image: none !important;
}
-table#payflow-table-donor{
+table#payment-table-donor{
/*margin-left: 10px;*/
}
@@ -176,10 +176,10 @@
div.donor { width: auto !important; }
div.donor { width: 100% !important; }
-#payflow-table-donor input[type="text"],
-#payflow-table-donor input:not([type]),
-#payflow-table-donor input[type="email"],
-#payflow-table-donor select {
+#payment-table-donor input[type="text"],
+#payment-table-donor input:not([type]),
+#payment-table-donor input[type="email"],
+#payment-table-donor select {
background-color: #f6f6f6;
padding: 1em !important;
-moz-box-shadow: 0 1px 1px rgba(0,0,0,.2), inset 0 0 0 1px rgba(0,0,0,.1);
@@ -194,16 +194,16 @@
margin-bottom: .2em;
}
-#payflow-table-donor input[type="text"]:hover,
-#payflow-table-donor input[type="email"]:hover,
-#payflow-table-donor select:hover {
+#payment-table-donor input[type="text"]:hover,
+#payment-table-donor input[type="email"]:hover,
+#payment-table-donor select:hover {
background: #003955;
color: #fff;
}
-#payflow-table-donor input[type="text"]:focus,
-#payflow-table-donor input[type="email"]:focus,
-#payflow-table-donor select:focus {
+#payment-table-donor input[type="text"]:focus,
+#payment-table-donor input[type="email"]:focus,
+#payment-table-donor select:focus {
background: #fff;
color: #00476b;
-moz-box-shadow: inset 0 1px 3px rgba(0,0,1,.5), inset 0 0 0 1px
rgba(0,0,0,.1);
@@ -211,7 +211,7 @@
box-shadow: inset 0 1px 3px rgba(0,0,1,.5), inset 0 0 0 1px rgba(0,0,0,.1);
}
-#payflow-table-donor select { padding: .9em 1em !important; line-height: 40px;
}
+#payment-table-donor select { padding: .9em 1em !important; line-height: 40px;
}
.mw-donate-submessage {
text-transform: uppercase;
diff --git a/globalcollect_gateway/forms/html/bt/bt.html
b/globalcollect_gateway/forms/html/bt/bt.html
index cf0ebea..0c497be 100644
--- a/globalcollect_gateway/forms/html/bt/bt.html
+++ b/globalcollect_gateway/forms/html/bt/bt.html
@@ -39,7 +39,7 @@
<td>
<div class="donor">
<form method="post"
name="paypalcontribution">
- <table id="payflow-table-donor">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
diff --git a/globalcollect_gateway/forms/html/cash/boletos.html
b/globalcollect_gateway/forms/html/cash/boletos.html
index 72029ea..eb84553 100644
--- a/globalcollect_gateway/forms/html/cash/boletos.html
+++ b/globalcollect_gateway/forms/html/cash/boletos.html
@@ -27,7 +27,7 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post"
action="@action">
- <table id="payflow-table-donor">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
diff --git a/globalcollect_gateway/forms/html/cc/cc-a.html
b/globalcollect_gateway/forms/html/cc/cc-a.html
index 430b728..9e831c5 100644
--- a/globalcollect_gateway/forms/html/cc/cc-a.html
+++ b/globalcollect_gateway/forms/html/cc/cc-a.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vm.html
b/globalcollect_gateway/forms/html/cc/cc-vm.html
index 20eb445..9f3c9ab 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vm.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vm.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vma.html
b/globalcollect_gateway/forms/html/cc/cc-vma.html
index 6910d33..cfd7c3f 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vma.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vma.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmad.html
b/globalcollect_gateway/forms/html/cc/cc-vmad.html
index 4d89ca5..b18c961 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmad.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmad.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
index 3010245..959c1f6 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmd.html
b/globalcollect_gateway/forms/html/cc/cc-vmd.html
index 49ea2ae..4c70c55 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmd.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmd.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmj.html
b/globalcollect_gateway/forms/html/cc/cc-vmj.html
index 5331e99..3161fab 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmj.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -63,7 +63,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/cc/cc.html
b/globalcollect_gateway/forms/html/cc/cc.html
index be34a10..cd582a5 100644
--- a/globalcollect_gateway/forms/html/cc/cc.html
+++ b/globalcollect_gateway/forms/html/cc/cc.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -53,7 +53,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
{% block country-instructions country %}
</div>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/dd/dd-recurring.html
b/globalcollect_gateway/forms/html/dd/dd-recurring.html
index f7d5099..3bf889f 100644
--- a/globalcollect_gateway/forms/html/dd/dd-recurring.html
+++ b/globalcollect_gateway/forms/html/dd/dd-recurring.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post"
action="@action">
- <div
id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>
- <div
class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
+ <div
class="mw-donate-submessage" id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
diff --git a/globalcollect_gateway/forms/html/dd/dd.html
b/globalcollect_gateway/forms/html/dd/dd.html
index 3c82d86..b66a811 100644
--- a/globalcollect_gateway/forms/html/dd/dd.html
+++ b/globalcollect_gateway/forms/html/dd/dd.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post"
action="@action">
- <div
id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>
- <div
class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
+ <div
class="mw-donate-submessage" id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
diff --git a/globalcollect_gateway/forms/html/ew/ew-alipay.html
b/globalcollect_gateway/forms/html/ew/ew-alipay.html
index 4602626..cbc4397 100644
--- a/globalcollect_gateway/forms/html/ew/ew-alipay.html
+++ b/globalcollect_gateway/forms/html/ew/ew-alipay.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="paypalcontribution" method="post"
action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -55,7 +55,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/ew/ew-webmoney.html
b/globalcollect_gateway/forms/html/ew/ew-webmoney.html
index dab0346..928dd90 100644
--- a/globalcollect_gateway/forms/html/ew/ew-webmoney.html
+++ b/globalcollect_gateway/forms/html/ew/ew-webmoney.html
@@ -20,8 +20,8 @@
<p id="topError" class="creditcard-error-msg"></p>
<form name="paypalcontribution" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
diff --git a/globalcollect_gateway/forms/html/ew/ew-yandex.html
b/globalcollect_gateway/forms/html/ew/ew-yandex.html
index 04bd3ca..a83f89f 100644
--- a/globalcollect_gateway/forms/html/ew/ew-yandex.html
+++ b/globalcollect_gateway/forms/html/ew/ew-yandex.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="paypalcontribution" method="post"
action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -55,7 +55,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/lightbox1.html
b/globalcollect_gateway/forms/html/lightbox1.html
index 2b8b8f7..94315a0 100644
--- a/globalcollect_gateway/forms/html/lightbox1.html
+++ b/globalcollect_gateway/forms/html/lightbox1.html
@@ -103,7 +103,7 @@
<form id="donationForm" name="donationForm" action=""
method="post">
<fieldset class="step">
<legend>Personal Information</legend>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="@action"
name="action" />
<input type="hidden" value="@amount"
name="amount" />
diff --git a/globalcollect_gateway/forms/html/obt/obt-bpay.html
b/globalcollect_gateway/forms/html/obt/obt-bpay.html
index 5d2aeb4..89a14c0 100644
--- a/globalcollect_gateway/forms/html/obt/obt-bpay.html
+++ b/globalcollect_gateway/forms/html/obt/obt-bpay.html
@@ -47,7 +47,7 @@
<p id="topError"></p>
<form method="post"
name="paypalcontribution">
- <table id="payflow-table-donor">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
index e226801..5c288ff 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
index 8d46178..2dbe40a 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
index ac1f29e..700a495 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
index a1a89c2..d818690 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
index 2cada22..e7b1c3a 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
index 1fe9d76..c82882e 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -62,7 +62,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/globalcollect_gateway/forms/html/rcc/rcc.html
b/globalcollect_gateway/forms/html/rcc/rcc.html
index 889f134..3c376d2 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc.html
@@ -20,8 +20,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td>
@@ -53,7 +53,7 @@
</tr>
<tr>
<td>
- <div class="mw-donate-submessage"
id="payflowpro_gateway-donate-submessage">
+ <div class="mw-donate-submessage"
id="payment_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
</td>
@@ -61,7 +61,7 @@
</tbody>
</table>
</div>
- <input type="hidden" name="gateway"
value="payflowpro" id="gateway" />
+ <input type="hidden" name="gateway"
value="globalcollect" id="gateway" />
<input type="hidden" name="returnto"
value="Thank_You/en" />
<input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
<input type="hidden" value="@amount"
name="amount">
diff --git a/modules/css/gateway.css b/modules/css/gateway.css
index f7307d4..a051a2c 100644
--- a/modules/css/gateway.css
+++ b/modules/css/gateway.css
@@ -38,51 +38,51 @@
margin-bottom: 1em;
}
-.payflow-cc-form-section {
+.payment-cc-form-section {
float: left;
}
-#payflowpro_gateway-personal-info {
+#payment_gateway-personal-info {
/* margin-right: 4em;
margin-bottom: 1em; */ /* This only seems to cause issues for RTL
languages */
}
-#payflowpro_gateway-form-submit, #payflowpro_gateway-form-submit-paypal {
+#payment_gateway-form-submit, #payment_gateway-form-submit-paypal {
margin-top: 1.2em;
text-align: center;
margin-bottom: 1em;
}
-#payflowpro_gateway-donate-addl-info {
+#payment_gateway-donate-addl-info {
margin-top: 4em;
margin-bottom: 4em;
clear: both;
}
-#payflow-table-cc td {
+#payment-table-cc td {
text-align: left;
}
-#payflow-table-donor, #payflow-table-cc, #payflow-table-paypal {
+#payment-table-donor, #payment-table-cc, #payment-table-paypal {
background-color: transparent;
}
-#payflow-table-donor td.label, #payflow-table-comment td.label,
#payflow-table-cc td.label {
+#payment-table-donor td.label, #payment-table-comment td.label,
#payment-table-cc td.label {
text-align: right;
display: block;
padding-right: 1em;
width: 94px;
}
-#payflow-table-comment td.check-option {
+#payment-table-comment td.check-option {
padding-left: 3em;
}
-#payflow-table-donor td {
+#payment-table-donor td {
text-align: left;
}
-#payflowpro_gateway-donate-addl-info-secure-logos {
+#payment_gateway-donate-addl-info-secure-logos {
float: left;
margin-right: 2em;
}
@@ -168,7 +168,7 @@
direction: ltr;
}
-#payflow-table-donor {
+#payment-table-donor {
white-space: nowrap;
}
@@ -239,7 +239,7 @@
padding: 1em;
width: inherit;
}
- table#payflow-table-donor {
+ table#payment-table-donor {
width: 100%;
}
@@ -260,7 +260,7 @@
}
/* Form - Contact/Donation Info */
- table#payflow-table-donor td {
+ table#payment-table-donor td {
padding: 0;
}
td#donate form select,
diff --git a/modules/validate_input.js b/modules/validate_input.js
index de0544b..5174e21 100644
--- a/modules/validate_input.js
+++ b/modules/validate_input.js
@@ -26,14 +26,14 @@
};
window.switchToPayPal = function () {
- document.getElementById('payflow-table-cc').style.display = 'none';
- document.getElementById('payflowpro_gateway-form-submit').style.display
= 'none';
-
document.getElementById('payflowpro_gateway-form-submit-paypal').style.display
= 'block';
+ document.getElementById('payment-table-cc').style.display = 'none';
+ document.getElementById('payment_gateway-form-submit').style.display =
'none';
+
document.getElementById('payment_gateway-form-submit-paypal').style.display =
'block';
};
window.switchToCreditCard = function () {
- document.getElementById('payflow-table-cc').style.display = 'table';
- document.getElementById('payflowpro_gateway-form-submit').style.display
= 'block';
-
document.getElementById('payflowpro_gateway-form-submit-paypal').style.display
= 'none';
+ document.getElementById('payment-table-cc').style.display = 'table';
+ document.getElementById('payment_gateway-form-submit').style.display =
'block';
+
document.getElementById('payment_gateway-form-submit-paypal').style.display =
'none';
};
/**
diff --git a/paypal_gateway/forms/html/paypal-recurring.html
b/paypal_gateway/forms/html/paypal-recurring.html
index e2ca580..7c18010 100644
--- a/paypal_gateway/forms/html/paypal-recurring.html
+++ b/paypal_gateway/forms/html/paypal-recurring.html
@@ -26,8 +26,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td colspan="2">
diff --git a/paypal_gateway/forms/html/paypal.html
b/paypal_gateway/forms/html/paypal.html
index c57827f..c3f058a 100644
--- a/paypal_gateway/forms/html/paypal.html
+++ b/paypal_gateway/forms/html/paypal.html
@@ -26,8 +26,8 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment" method="post" action="@action">
- <div id="payflowpro_gateway-personal-info">
- <table id="payflow-table-donor">
+ <div id="payment_gateway-personal-info">
+ <table id="payment-table-donor">
<tbody>
<tr>
<td colspan="2">
diff --git a/tests/Gateway_FormTest.php b/tests/Gateway_FormTest.php
index a7dc10a..8ae3977 100644
--- a/tests/Gateway_FormTest.php
+++ b/tests/Gateway_FormTest.php
@@ -59,13 +59,13 @@
public function testGenerateDonationFooter() {
global $wgExtensionAssetsPath;
- $expected = '<div class="payflow-cc-form-section"
id="payflowpro_gateway-donate-addl-info">';
- $expected .= '<div
id="payflowpro_gateway-donate-addl-info-secure-logos">';
+ $expected = '<div class="payment-cc-form-section"
id="payment_gateway-donate-addl-info">';
+ $expected .= '<div
id="payment_gateway-donate-addl-info-secure-logos">';
$expected .= '<p class="">';
$expected .= '<img src="' .
$wgExtensionAssetsPath .
'/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png">';
$expected .= '</p>';
$expected .= '</div>';
- $expected .= '<div
id="payflowpro_gateway-donate-addl-info-text">';
+ $expected .= '<div
id="payment_gateway-donate-addl-info-text">';
$expected .= '<p class="">';
$expected .= wfMessage(
'donate_interface-otherways-short' )->text();
$expected .= '</p>';
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index 2f00d4d..cbfb093 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -27,11 +27,11 @@
}
/* areas shared with other gateways */
-div#payflowpro_gateway-donate-submessage {
+div#payment_gateway-donate-submessage {
font-size: 90%;
line-height: 120%;
}
-#payflowpro_gateway-personal-info {
+#payment_gateway-personal-info {
margin-right:0 !important;
}
diff --git a/worldpay_gateway/forms/html/worldpay-dd-test.html
b/worldpay_gateway/forms/html/worldpay-dd-test.html
index d5262bf..08a4ee1 100644
--- a/worldpay_gateway/forms/html/worldpay-dd-test.html
+++ b/worldpay_gateway/forms/html/worldpay-dd-test.html
@@ -34,7 +34,7 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment"
method="post" action="@wp_process_url" novalidate>
- <div
id="payflowpro_gateway_gateway-personal-info">
+ <div
id="payment_gateway_gateway-personal-info">
<div
class="row-fluid">
<span
class="personalInfo">
{% block personal-information country %}
@@ -75,7 +75,7 @@
</div>
</div>
-
<div class="row-fluid mw-donate-submessage"
id="payflowpro_gateway_gateway-donate-submessage">
+
<div class="row-fluid mw-donate-submessage"
id="payment_gateway_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
diff --git a/worldpay_gateway/forms/html/worldpay-test.html
b/worldpay_gateway/forms/html/worldpay-test.html
index 6573dd3..dd3ed67 100644
--- a/worldpay_gateway/forms/html/worldpay-test.html
+++ b/worldpay_gateway/forms/html/worldpay-test.html
@@ -34,7 +34,7 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment"
method="post" action="@wp_process_url" novalidate>
- <div
id="payflowpro_gateway_gateway-personal-info">
+ <div
id="payment_gateway_gateway-personal-info">
<div
class="row-fluid">
<span
class="personalInfo">
@@ -45,7 +45,7 @@
<div
id="payment" class="row-fluid gainlayout" style="height: 0;text-align:
center;"></div>
- <div
class="row-fluid mw-donate-submessage"
id="payflowpro_gateway_gateway-donate-submessage">
+ <div
class="row-fluid mw-donate-submessage"
id="payment_gateway_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
diff --git a/worldpay_gateway/forms/html/worldpay.html
b/worldpay_gateway/forms/html/worldpay.html
index 671e1d0..c27d055 100644
--- a/worldpay_gateway/forms/html/worldpay.html
+++ b/worldpay_gateway/forms/html/worldpay.html
@@ -34,7 +34,7 @@
<p id="topError"
class="creditcard-error-msg"></p>
<form name="payment"
method="post" action="@wp_process_url" novalidate>
- <div
id="payflowpro_gateway_gateway-personal-info">
+ <div
id="payment_gateway_gateway-personal-info">
<div
class="row-fluid">
<span
class="personalInfo">
@@ -45,7 +45,7 @@
<div
id="payment" class="row-fluid gainlayout" style="height: 0;text-align:
center;"></div>
- <div
class="row-fluid mw-donate-submessage"
id="payflowpro_gateway_gateway-donate-submessage">
+ <div
class="row-fluid mw-donate-submessage"
id="payment_gateway_gateway-donate-submessage">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
--
To view, visit https://gerrit.wikimedia.org/r/186377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ede5d9565004fc9d9a9632a410cf935f4adf77b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
