jenkins-bot has submitted this change and it was merged.
Change subject: Add form partials for WP button copy
......................................................................
Add form partials for WP button copy
edit: I just added another main test html page for now.
WIP - handle case where no ffname - need advice on this templating
language. Want to do something like:
"{% block wp_ott_form ffname ? ffname : country %}" on line 42 in
worldpay.html halp
PS4 [K4]: Made the blue button overrides !important, so they
always override when this class is in use. Otherwise, they were
not working for me (ff 33.0, Ubuntu)
[pizzzacat]: fixed the blue/grey buttons
Change-Id: I4d7d87b1d586e85fd0ac27381602170c61bef736
---
M worldpay_gateway/forms/css/worldpay.css
A worldpay_gateway/forms/html/_wp_ott_form/wp-btnb.html
A worldpay_gateway/forms/html/_wp_ott_form/wp-btng.html
A worldpay_gateway/forms/html/_wp_ott_form/wp-fud.html
A worldpay_gateway/forms/html/_wp_ott_form/wp-sn.html
A worldpay_gateway/forms/html/_wp_ott_form/wp-sw.html
A worldpay_gateway/forms/html/worldpay-test.html
M worldpay_gateway/forms/html/worldpay.html
8 files changed, 379 insertions(+), 7 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index df9ae9e..d01b9e3 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -113,6 +113,19 @@
margin-top: 0 !important;
}
+.btn-specialBlue {
+ background-color: #367fb4 !important;
+ color: #fff !important;
+}
+
+.btn-specialGrey {
+ height: 34px;
+ color: #333333 !important;
+ background-color: #ffffff !important;
+ border-color: #cccccc !important;
+ background-image: linear-gradient( #ffffff, #cccccc ) !important;
+}
+
/* Legal text and informational links */
p#informationsharing, p#monthlycancel {
width: 100%;
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/wp-btnb.html
b/worldpay_gateway/forms/html/_wp_ott_form/wp-btnb.html
new file mode 100644
index 0000000..843ac03
--- /dev/null
+++ b/worldpay_gateway/forms/html/_wp_ott_form/wp-btnb.html
@@ -0,0 +1,51 @@
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input type="hidden" value="@wp_one_time_token" name="OTT"
id="wp_one_time_token"/>
+ <h3 class="ccAreaHeader">
+ <div class="row-fluid">
+ <span class="pull-left">
+ <img alt="MasterCard"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png"
/>
+ <img alt="Visa"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png"
/>
+ <img alt="Carte Bleue"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-cartebleue.png"
/>
+ </span>
+ </div>
+ </h3>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-6">
+ <label for="accountNumber"
id="accountNumber-label">%donate_interface-donor-card-num%</label>
+ <input type="text" id="accountNumber" class="form-control"
pattern="\d*"
+ autocomplete="off"
+ placeholder='1111 1111 1111 1111'/>
+ </div>
+
+ <span id="smCC">
+ <div class="col-md-3">
+ <label for="expiry"
id="expiry-label">%donate_interface-donor-expiration%</label>
+ <input type="text" class="form-control" id="expiry"
pattern="\d*" autocomplete="off"
+ placeholder='05/2015'/>
+ </div>
+ <div class="col-md-3">
+ <label for="cvc"
id="cvc-label">%donate_interface-cvv%</label>
+ <input type="text" class="form-control" id="cvc"
pattern="\d*"
+ autocomplete="off"
+ placeholder='123'/>
+ </div>
+ </span>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <div class="ccError ccNumberError">•
%donate_interface-error-msg-card-num%</div>
+ <div class="ccError ccExpiryError">•
%donate_interface-error-msg-expiration%</div>
+ <div class="ccError ccCVCError">•
%donate_interface-error-msg-cvv%</div>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input class="btn btn-specialBlue form-control"
id="paymentSubmitBtn" type="button" value="%donate_interface-continue%" />
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/wp-btng.html
b/worldpay_gateway/forms/html/_wp_ott_form/wp-btng.html
new file mode 100644
index 0000000..6de4ca9
--- /dev/null
+++ b/worldpay_gateway/forms/html/_wp_ott_form/wp-btng.html
@@ -0,0 +1,51 @@
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input type="hidden" value="@wp_one_time_token" name="OTT"
id="wp_one_time_token"/>
+ <h3 class="ccAreaHeader">
+ <div class="row-fluid">
+ <span class="pull-left">
+ <img alt="MasterCard"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png"
/>
+ <img alt="Visa"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png"
/>
+ <img alt="Carte Bleue"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-cartebleue.png"
/>
+ </span>
+ </div>
+ </h3>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-6">
+ <label for="accountNumber"
id="accountNumber-label">%donate_interface-donor-card-num%</label>
+ <input type="text" id="accountNumber" class="form-control"
pattern="\d*"
+ autocomplete="off"
+ placeholder='1111 1111 1111 1111'/>
+ </div>
+
+ <span id="smCC">
+ <div class="col-md-3">
+ <label for="expiry"
id="expiry-label">%donate_interface-donor-expiration%</label>
+ <input type="text" class="form-control" id="expiry"
pattern="\d*" autocomplete="off"
+ placeholder='05/2015'/>
+ </div>
+ <div class="col-md-3">
+ <label for="cvc"
id="cvc-label">%donate_interface-cvv%</label>
+ <input type="text" class="form-control" id="cvc"
pattern="\d*"
+ autocomplete="off"
+ placeholder='123'/>
+ </div>
+ </span>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <div class="ccError ccNumberError">•
%donate_interface-error-msg-card-num%</div>
+ <div class="ccError ccExpiryError">•
%donate_interface-error-msg-expiration%</div>
+ <div class="ccError ccCVCError">•
%donate_interface-error-msg-cvv%</div>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input class="btn btn-specialGrey btn-large form-control"
id="paymentSubmitBtn" type="button" value="%donate_interface-continue%" />
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/wp-fud.html
b/worldpay_gateway/forms/html/_wp_ott_form/wp-fud.html
new file mode 100644
index 0000000..5a219e2
--- /dev/null
+++ b/worldpay_gateway/forms/html/_wp_ott_form/wp-fud.html
@@ -0,0 +1,51 @@
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input type="hidden" value="@wp_one_time_token" name="OTT"
id="wp_one_time_token"/>
+ <h3 class="ccAreaHeader">
+ <div class="row-fluid">
+ <span class="pull-left">
+ <img alt="MasterCard"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png"
/>
+ <img alt="Visa"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png"
/>
+ <img alt="Carte Bleue"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-cartebleue.png"
/>
+ </span>
+ </div>
+ </h3>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-6">
+ <label for="accountNumber"
id="accountNumber-label">%donate_interface-donor-card-num%</label>
+ <input type="text" id="accountNumber" class="form-control"
pattern="\d*"
+ autocomplete="off"
+ placeholder='1111 1111 1111 1111'/>
+ </div>
+
+ <span id="smCC">
+ <div class="col-md-3">
+ <label for="expiry"
id="expiry-label">%donate_interface-donor-expiration%</label>
+ <input type="text" class="form-control" id="expiry"
pattern="\d*" autocomplete="off"
+ placeholder='05/2015'/>
+ </div>
+ <div class="col-md-3">
+ <label for="cvc"
id="cvc-label">%donate_interface-cvv%</label>
+ <input type="text" class="form-control" id="cvc"
pattern="\d*"
+ autocomplete="off"
+ placeholder='123'/>
+ </div>
+ </span>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <div class="ccError ccNumberError">•
%donate_interface-error-msg-card-num%</div>
+ <div class="ccError ccExpiryError">•
%donate_interface-error-msg-expiration%</div>
+ <div class="ccError ccCVCError">•
%donate_interface-error-msg-cvv%</div>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input class="btn btn-info btn-large form-control"
id="paymentSubmitBtn" type="button" value="Faites un don" />
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/wp-sn.html
b/worldpay_gateway/forms/html/_wp_ott_form/wp-sn.html
new file mode 100644
index 0000000..101f8c9
--- /dev/null
+++ b/worldpay_gateway/forms/html/_wp_ott_form/wp-sn.html
@@ -0,0 +1,51 @@
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input type="hidden" value="@wp_one_time_token" name="OTT"
id="wp_one_time_token"/>
+ <h3 class="ccAreaHeader">
+ <div class="row-fluid">
+ <span class="pull-left">
+ <img alt="MasterCard"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png"
/>
+ <img alt="Visa"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png"
/>
+ <img alt="Carte Bleue"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-cartebleue.png"
/>
+ </span>
+ </div>
+ </h3>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-6">
+ <label for="accountNumber"
id="accountNumber-label">%donate_interface-donor-card-num%</label>
+ <input type="text" id="accountNumber" class="form-control"
pattern="\d*"
+ autocomplete="off"
+ placeholder='1111 1111 1111 1111'/>
+ </div>
+
+ <span id="smCC">
+ <div class="col-md-3">
+ <label for="expiry"
id="expiry-label">%donate_interface-donor-expiration%</label>
+ <input type="text" class="form-control" id="expiry"
pattern="\d*" autocomplete="off"
+ placeholder='05/2015'/>
+ </div>
+ <div class="col-md-3">
+ <label for="cvc"
id="cvc-label">%donate_interface-cvv%</label>
+ <input type="text" class="form-control" id="cvc"
pattern="\d*"
+ autocomplete="off"
+ placeholder='123'/>
+ </div>
+ </span>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <div class="ccError ccNumberError">•
%donate_interface-error-msg-card-num%</div>
+ <div class="ccError ccExpiryError">•
%donate_interface-error-msg-expiration%</div>
+ <div class="ccError ccCVCError">•
%donate_interface-error-msg-cvv%</div>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input class="btn btn-info btn-large form-control"
id="paymentSubmitBtn" type="button" value="Soutenez-nous" />
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/wp-sw.html
b/worldpay_gateway/forms/html/_wp_ott_form/wp-sw.html
new file mode 100644
index 0000000..4172795
--- /dev/null
+++ b/worldpay_gateway/forms/html/_wp_ott_form/wp-sw.html
@@ -0,0 +1,51 @@
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input type="hidden" value="@wp_one_time_token" name="OTT"
id="wp_one_time_token"/>
+ <h3 class="ccAreaHeader">
+ <div class="row-fluid">
+ <span class="pull-left">
+ <img alt="MasterCard"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png"
/>
+ <img alt="Visa"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png"
/>
+ <img alt="Carte Bleue"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-cartebleue.png"
/>
+ </span>
+ </div>
+ </h3>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-6">
+ <label for="accountNumber"
id="accountNumber-label">%donate_interface-donor-card-num%</label>
+ <input type="text" id="accountNumber" class="form-control"
pattern="\d*"
+ autocomplete="off"
+ placeholder='1111 1111 1111 1111'/>
+ </div>
+
+ <span id="smCC">
+ <div class="col-md-3">
+ <label for="expiry"
id="expiry-label">%donate_interface-donor-expiration%</label>
+ <input type="text" class="form-control" id="expiry"
pattern="\d*" autocomplete="off"
+ placeholder='05/2015'/>
+ </div>
+ <div class="col-md-3">
+ <label for="cvc"
id="cvc-label">%donate_interface-cvv%</label>
+ <input type="text" class="form-control" id="cvc"
pattern="\d*"
+ autocomplete="off"
+ placeholder='123'/>
+ </div>
+ </span>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <div class="ccError ccNumberError">•
%donate_interface-error-msg-card-num%</div>
+ <div class="ccError ccExpiryError">•
%donate_interface-error-msg-expiration%</div>
+ <div class="ccError ccCVCError">•
%donate_interface-error-msg-cvv%</div>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="col-md-12">
+ <input class="btn btn-info btn-large form-control"
id="paymentSubmitBtn" type="button" value="Soutenez Wikipédia" />
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/worldpay-test.html
b/worldpay_gateway/forms/html/worldpay-test.html
new file mode 100644
index 0000000..6573dd3
--- /dev/null
+++ b/worldpay_gateway/forms/html/worldpay-test.html
@@ -0,0 +1,104 @@
+<script type="text/javascript">
+ mw.loader.using(
+ [ 'jquery.payment' ],
+ function() {
+ //$( '#adyen-encrypted-form-number' ).payment(
'formatCardNumber' );
+ //$( '#expiry' ).payment( 'formatCardExpiry' );
+ //$( '#adyen-encrypted-form-cvc' ).payment(
'formatCardCVC' );
+ }
+ );
+
+ // these must go through RapidHTML and thus are inline
+ var amountErrors = ['#general|escape', '#retryMsg|escape',
'#amount|escape'];
+ var billingErrors = [
+ '#fname|escape', '#lname|escape', '#city|escape',
'#country|escape', '#street|escape',
+ '#state|escape', '#zip|escape', '#emailAdd|escape'
+ ];
+ var paymentErrors = ['#card_num|escape', '#card_type|escape',
'#cvv|escape'];
+ var actionURL = "@action";
+ var scriptPath = "@script_path";
+</script>
+<div class="container" id="wpContainer">
+ <div class="row-fluid">
+
+ <div class="col-md-6" id="appeal" valign="top">
+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
+ </div>
+
+ <div class="col-md-6">
+ <div class="row-fluid" id="donate">
+ <div class="col-md-12">
+
+ <div class="row-fluid formCol"
id="greenBackground">
+ @noscript
+ <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
class="row-fluid">
+ <span
class="personalInfo">
+ {%
block personal-information country %}
+ {%
block wp_ott_form ffname %}
+ </span>
+ </div>
+
+ <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">
+
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
+
style="vertical-align:baseline;margin-right:4px;">
+
%donate_interface-donate-click%
+ </div>
+
+
+ </div>
+
+
+
+ <!-- This should be
included in the personal_information templates -->
+ <input
class="form-control" type="hidden" value="@utm_source" id="utm_source"/>
+ <input
class="form-control" type="hidden" value="@utm_medium" id="utm_medium"/>
+ <input
class="form-control" type="hidden" value="@utm_campaign" id="utm_campaign"/>
+ <input
class="form-control" type="hidden" value="@language" id="language"/>
+ <input
class="form-control" type="hidden" value="@referrer" id="referrer"/>
+ <input
class="form-control" type="hidden" value="1" id="email-opt"/>
+ <input
class="form-control" type="hidden" value="@token" id="token"/>
+ <input
class="form-control" type="hidden" value="@order_id" id="order_id"/>
+ <input
class="form-control" type="hidden" value="@contribution_tracking_id"
id="contribution_tracking_id"/>
+ <input
class="form-control" type="hidden" value="@data_hash" id="data_hash"/>
+ <input
class="form-control" type="hidden" value="@owa_session" id="owa_session"/>
+ <input
class="form-control" type="hidden" value="@owa_ref" id="owa_ref"/>
+ <input
class="form-control" type="hidden" value="@gateway" id="gateway"/>
+ <input
class="form-control" type="hidden" value="cc" id="payment_method"/>
+
+
+ </form>
+
+
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row-fluid formCol">
+ <div class="col-md-12">
+ <p
id="informationsharing">%donate_interface-informationsharing|url%</p>
+ </div>
+ </div>
+
+ <div class="row-fluid formCol">
+ <div class="col-md-6 pull-left">
+ {% block moreinfolinks %}
+ </div>
+ <div class="col-md-6 formCol">
+ <span class="pull-right">@verisign_logo
</span>
+ </div>
+ </div>
+
+
+
+ </div>
+
+ </div>
+</div>
diff --git a/worldpay_gateway/forms/html/worldpay.html
b/worldpay_gateway/forms/html/worldpay.html
index b0d112e..671e1d0 100644
--- a/worldpay_gateway/forms/html/worldpay.html
+++ b/worldpay_gateway/forms/html/worldpay.html
@@ -42,16 +42,16 @@
{%
block wp_ott_form country %}
</span>
</div>
-
+
<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">
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-right:4px;">
%donate_interface-donate-click%
</div>
-
-
+
+
</div>
@@ -75,9 +75,9 @@
</form>
-
+
</div>
-
+
</div>
</div>
@@ -96,7 +96,7 @@
</div>
</div>
-
+
</div>
--
To view, visit https://gerrit.wikimedia.org/r/169341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d7d87b1d586e85fd0ac27381602170c61bef736
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
