Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/281974
Change subject: [WIP] Bring iDEAL forms more in line with our newer RapidHtml
forms
......................................................................
[WIP] Bring iDEAL forms more in line with our newer RapidHtml forms
This gives us the red borders and error messages.
FIXME: Not successfully redirecting to the banks, I might have broken the .js
Bug: T131913
Change-Id: I69d15a10568b4268108f962441f76550d6fdde92
---
M gateway_forms/rapidhtml/RapidHtmlResources.php
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
3 files changed, 64 insertions(+), 72 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/74/281974/1
diff --git a/gateway_forms/rapidhtml/RapidHtmlResources.php
b/gateway_forms/rapidhtml/RapidHtmlResources.php
index b6df2f9..ed142c6 100644
--- a/gateway_forms/rapidhtml/RapidHtmlResources.php
+++ b/gateway_forms/rapidhtml/RapidHtmlResources.php
@@ -172,6 +172,16 @@
'localBasePath' => __DIR__ . '/../../globalcollect_gateway/forms',
'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
);
+$wgResourceModules[ 'gc.form.rapidhtml.rtbt' ] = array(
+ 'styles' => 'css/gc.css',
+ 'dependencies' => array(
+ 'di.form.core.validate',
+ 'mediawiki.Uri',
+ 'gc.form.rapidhtml.webitects.bt',
+ ),
+ 'localBasePath' => __DIR__ . '/../../globalcollect_gateway/forms',
+ 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath,
+);
$wgResourceModules[ 'gc.iframe' ] = array(
'styles' => 'css/iframe.css',
'localBasePath' => __DIR__ . '/../../globalcollect_gateway/forms',
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
index 063b75b..61d8e42 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
@@ -1,5 +1,5 @@
<script type="text/javascript">
- mw.loader.load('gc.form.rapidhtml.webitects.bt');
+ mw.loader.load('gc.form.rapidhtml.rtbt');
// 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'];
@@ -60,44 +60,34 @@
</table>
</div>
+ <table>
+ {%
block personal-information country %}
+ </table>
-
<h3>%donate_interface-billing-address% <span class="mute" id="change-billing"
style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3>
- <div
id="billing-content" class="gainlayout">
- <div
id="billingErrorMessages" class="small"></div>
- <div
id="paymentErrorMessages" class="small"></div>
- <div
class="name-fields">
-
<span class="name-first"><input class="txt" id="fname" name="fname"
title="%donate_interface-donor-fname%" value="@fname"
placeholder="%donate_interface-donor-fname%"/></span>
-
<span class="name-last"><input class="txt" id="lname" name="lname"
title="%donate_interface-donor-lname%" value="@lname"
placeholder="%donate_interface-donor-lname%"/></span>
- </div>
+ <table
style="margin-top: 10px;" >
+ <tr><td>
+
<select style="margin-top: 15px;" id="issuer_id" name="issuer_id"
value="@issuer_id">
+
<option value="">%donate_interface-rtbt-issuer_id%...</option>
+
<optgroup>
+
<option value="31">ABN AMRO</option>
+
<option value="721">ING</option>
+
<option value="21">Rabobank</option>
+
<option value="751">SNS Bank</option>
+
</optgroup>
+
<optgroup label="%donate_interface-rtbt-issuer_id-longlist%">
+
<option value="761">ASN Bank</option>
+
<!-- <option value="801">Knab</option> -->
+
<option value="771">RegioBank</option>
+
<option value="511">Triodos Bank</option>
+
<option value="161">Van Lanschot Bankiers</option>
+
</optgroup>
+
</select>
-
<p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd"
name="emailAdd" value="@emailAdd"
placeholder="%donate_interface-donor-email%"/> </p>
- <table
style="margin-top: 10px;" >
-
<tr><td>
-
<select style="margin-top: 15px;" id="issuer_id" name="issuer_id"
value="@issuer_id">
-
<option value="">%donate_interface-rtbt-issuer_id%...</option>
-
<optgroup>
-
<option value="31">ABN AMRO</option>
-
<option value="721">ING</option>
-
<option value="21">Rabobank</option>
-
<option value="751">SNS Bank</option>
-
</optgroup>
-
<optgroup label="%donate_interface-rtbt-issuer_id-longlist%">
-
<option value="761">ASN Bank</option>
-
<!-- <option value="801">Knab</option> -->
-
<option value="771">RegioBank</option>
-
<option value="511">Triodos Bank</option>
-
<option value="161">Van Lanschot Bankiers</option>
-
</optgroup>
-
</select>
-
-
<div id="bt-continue" style="margin-top: 15px;"> <input class="btn"
id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
-
</td><td>
-
<img style="margin-left: 25px;"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/iDEAL-klein.gif"
alt="IDEAL klein">
-
</td></tr>
- </table>
-
- </div>
-
+
<div id="bt-continue" style="margin-top: 15px;"> <input class="btn"
id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
+
</td><td>
+
<img style="margin-left: 25px;"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/iDEAL-klein.gif"
alt="IDEAL klein">
+
</td></tr>
+ </table>
<input
type="hidden" name="returnto" value="Thank_You/en" />
<input
type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
index e143300..8206e6e 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
@@ -1,5 +1,5 @@
<script type="text/javascript">
- mw.loader.load('gc.form.rapidhtml.webitects.bt');
+ mw.loader.load('gc.form.rapidhtml.rtbt');
// 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'];
@@ -60,42 +60,34 @@
</table>
</div>
+ <table>
+ {%
block personal-information country %}
+ </table>
-
<h3>%donate_interface-cc-form-header-personal% <span class="mute"
id="change-billing" style="display: none;">(<a
href="#">%donate_interface-change%</a>)</span></h3>
- <div
id="billing-content" class="gainlayout">
- <div
id="billingErrorMessages" class="small"></div>
- <div
id="paymentErrorMessages" class="small"></div>
- <div
class="name-fields">
-
<span class="name-first"><input class="txt optional" id="fname" name="fname"
title="%donate_interface-donor-fname%" value="@fname"
placeholder="%donate_interface-donor-fname%"/></span>
-
<span class="name-last"><input class="txt optional" id="lname" name="lname"
title="%donate_interface-donor-lname%" value="@lname"
placeholder="%donate_interface-donor-lname%"/></span>
- </div>
-
<p><input class="txt optional" title="%donate_interface-donor-email%"
id="emailAdd" name="emailAdd" value="@emailAdd"
placeholder="%donate_interface-donor-email%"/> </p>
- <table
style="margin-top: 10px;" >
-
<tr><td>
-
<select style="margin-top: 15px;" id="issuer_id" name="issuer_id"
value="@issuer_id">
-
<option value="">%donate_interface-rtbt-issuer_id%...</option>
-
<optgroup>
-
<option value="31">ABN AMRO</option>
-
<option value="721">ING</option>
-
<option value="21">Rabobank</option>
-
<option value="751">SNS Bank</option>
-
</optgroup>
-
<optgroup label="%donate_interface-rtbt-issuer_id-longlist%">
-
<option value="761">ASN Bank</option>
-
<!-- <option value="801">Knab</option> -->
-
<option value="771">RegioBank</option>
-
<option value="511">Triodos Bank</option>
-
<option value="161">Van Lanschot Bankiers</option>
-
</optgroup>
-
</select>
+ <table
style="margin-top: 10px;" >
+ <tr><td>
+
<select style="margin-top: 15px;" id="issuer_id" name="issuer_id"
value="@issuer_id">
+
<option value="">%donate_interface-rtbt-issuer_id%...</option>
+
<optgroup>
+
<option value="31">ABN AMRO</option>
+
<option value="721">ING</option>
+
<option value="21">Rabobank</option>
+
<option value="751">SNS Bank</option>
+
</optgroup>
+
<optgroup label="%donate_interface-rtbt-issuer_id-longlist%">
+
<option value="761">ASN Bank</option>
+
<!-- <option value="801">Knab</option> -->
+
<option value="771">RegioBank</option>
+
<option value="511">Triodos Bank</option>
+
<option value="161">Van Lanschot Bankiers</option>
+
</optgroup>
+
</select>
-
<div id="bt-continue" style="margin-top: 15px;"> <input class="btn"
id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
-
</td><td>
-
<img style="margin-left: 25px;"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/iDEAL-klein.gif"
alt="IDEAL klein">
-
</td></tr>
- </table>
- </div>
-
+
<div id="bt-continue" style="margin-top: 15px;"> <input class="btn"
id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
+
</td><td>
+
<img style="margin-left: 25px;"
src="@script_path/extensions/DonationInterface/gateway_forms/includes/iDEAL-klein.gif"
alt="IDEAL klein">
+
</td></tr>
+ </table>
<input
type="hidden" name="returnto" value="Thank_You/en" />
<input
type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
--
To view, visit https://gerrit.wikimedia.org/r/281974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69d15a10568b4268108f962441f76550d6fdde92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
