r105593 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r105592‎ \| r105593 \| r105594 >
Date:	21:28, 8 December 2011
Author:	pgehres
Status:	ok
Tags:
Comment:	Adding AU and CA rcc forms
Modified paths:	/trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-AU.html (added) (history) /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-CA.html (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-CA.html
—	—	@@ -0,0 +1,148 @@
	2	+<script type="text/javascript">
	3	+ mw.loader.load('gc.form.rapidhtml.cc');
	4	+ // these must go through RapidHTML and thus are inline
	5	+ var amountErrors = ['#general\|escape','#retryMsg\|escape','#amount\|escape'];
	6	+ var billingErrors = ['#fname\|escape','#lname\|escape','#city\|escape','#country\|escape','#street\|escape','#state\|escape','#zip\|escape','#emailAdd\|escape'];
	7	+ var paymentErrors = ['#card_num\|escape','#card_type\|escape','#cvv\|escape'];
	8	+ var actionURL = "@action";
	9	+ var scriptPath = "@script_path";
	10	+</script>
	11	+
	12	+<table width="100%" cellspacing="0" cellpadding="0" border="0">
	13	+ <tbody>
	14	+ <tr>
	15	+ <td id="appeal" valign="top">
	16	+ {{LanguageSwitch\|2011FR/@appeal/text\|@language}}
	17	+ </td>
	18	+ <td id="donate" valign="top">
	19	+ <div id="greenBackground" class="">
	20	+ <noscript>
	21	+ <div id="noscript">
	22	+ <p id="noscript-msg">%donate_interface-noscript-msg%</p>
	23	+ <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p>
	24	+ <p id="noscript-redirect-link"><a href="https://www.mediawiki.org//wikimediafoundation.org/wiki/DonateNonJS/en">wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
	25	+ </div>
	26	+ </noscript>
	27	+ <p id="topError" class="creditcard-error-msg"></p>
	28	+
	29	+ <form name="payment" method="post" action="@action">
	30	+ <div id="payflowpro_gateway-personal-info">
	31	+ <table id="payflow-table-donor">
	32	+ <tbody>
	33	+ <tr>
	34	+ <td colspan="2">
	35	+ <div id="step1header">
	36	+ <h3 class="amount_header">%donate_interface-amount-recurring% <span id="selected-amount">$@amount (CAD)</span></h3>
	37	+ </div>
	38	+ </td>
	39	+ </tr>
	40	+ <tr>
	41	+ <td colspan="2"><h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
	42	+ </tr>
	43	+ <tr>
	44	+ <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-lname%" id="fname"><input name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"></td>
	45	+ </tr>
	46	+ <tr>
	47	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	48	+ </tr>
	49	+ <tr>
	50	+ <td colspan="2"><input name="street" value="@street" type="text" placeholder="%donate_interface-donor-street%" id="street"></td>
	51	+ </tr>
	52	+ <tr>
	53	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	54	+ </tr>
	55	+ <tr>
	56	+ <td colspan="2"><input name="city" value="@city" type="text" placeholder="%donate_interface-donor-city%" id="city">
	57	+ <select id="state" name="state" class="txt" value="@state" >
	58	+ <option value=""></option>
	59	+ <option value="AB">AB</option>
	60	+ <option value="BC">BC</option>
	61	+ <option value="MB">MB</option>
	62	+ <option value="NB">NB</option>
	63	+ <option value="NL">NL</option>
	64	+ <option value="NS">NS</option>
	65	+ <option value="ON">ON</option>
	66	+ <option value="PE">PE</option>
	67	+ <option value="QC">QC</option>
	68	+ <option value="SK">SK</option>
	69	+ </select>
	70	+ <input name="zip" value="@zip" type="text" placeholder="%donate_interface-donor-postal%" id="zip">
	71	+ </td>
	72	+ </tr>
	73	+ <tr>
	74	+ <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="%donate_interface-donor-email%" id="emailAdd"></td>
	75	+ </tr>
	76	+ <tr>
	77	+ <td>
	78	+ <dl class="">
	79	+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
	80	+ <ul class="options-h" id="cards" style="margin: 0;">
	81	+ <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>
	82	+ <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>
	83	+ <!--<li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>-->
	84	+ <!--<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>-->
	85	+ </ul>
	86	+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
	87	+ </dd>
	88	+ </dl>
	89	+ </td>
	90	+ </tr>
	91	+ <tr>
	92	+ <td>
	93	+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
	94	+ </td>
	95	+ </tr>
	96	+ <tr>
	97	+ <td>
	98	+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
	99	+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">%donate_interface-donate-click%
	100	+ </div>
	101	+ </td>
	102	+ </tr>
	103	+ </tbody>
	104	+ </table>
	105	+ </div>
	106	+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
	107	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	108	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	109	+ <input type="hidden" value="@amount" name="amount">
	110	+ <input type="hidden" value="CA" name="country" id="country" />
	111	+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
	112	+ <input type="hidden" value="CAD" name="currency_code" />
	113	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	114	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	115	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	116	+ <input type="hidden" value="@language" name="language"/>
	117	+ <input type="hidden" value="@referrer" name="referrer"/>
	118	+ <input type="hidden" value="@comment" name="comment"/>
	119	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	120	+ <input type="hidden" value="1" name="email-opt"/>
	121	+ <input type="hidden" value="@token" name="token"/>
	122	+ <input type="hidden" value="@order_id" name="order_id"/>
	123	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	124	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	125	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	126	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	127	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	128	+ <input type="hidden" value="@gateway" name="gateway"/>
	129	+ <input type="hidden" value="cc" name="payment_method"/>
	130	+ </form>
	131	+ </div>
	132	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	133	+ <table>
	134	+ <tr>
	135	+ <td>
	136	+ <ul id="moreinfolinks">
	137	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
	138	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
	139	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	140	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
	141	+ </ul>
	142	+ </td>
	143	+ <td>@verisign_logo</td>
	144	+ </tr>
	145	+ </table>
	146	+ </td>
	147	+ </tr>
	148	+ </tbody>
	149	+</table>
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-CA.html
___________________________________________________________________
Added: svn:eol-style
1	150	+ native
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-AU.html
—	—	@@ -0,0 +1,148 @@
	2	+<script type="text/javascript">
	3	+ mw.loader.load('gc.form.rapidhtml.cc');
	4	+ // these must go through RapidHTML and thus are inline
	5	+ var amountErrors = ['#general\|escape','#retryMsg\|escape','#amount\|escape'];
	6	+ var billingErrors = ['#fname\|escape','#lname\|escape','#city\|escape','#country\|escape','#street\|escape','#state\|escape','#zip\|escape','#emailAdd\|escape'];
	7	+ var paymentErrors = ['#card_num\|escape','#card_type\|escape','#cvv\|escape'];
	8	+ var actionURL = "@action";
	9	+ var scriptPath = "@script_path";
	10	+</script>
	11	+
	12	+<table width="100%" cellspacing="0" cellpadding="0" border="0">
	13	+ <tbody>
	14	+ <tr>
	15	+ <td id="appeal" valign="top">
	16	+ {{LanguageSwitch\|2011FR/@appeal/text\|@language}}
	17	+ </td>
	18	+ <td id="donate" valign="top">
	19	+ <div id="greenBackground" class="">
	20	+ <noscript>
	21	+ <div id="noscript">
	22	+ <p id="noscript-msg">%donate_interface-noscript-msg%</p>
	23	+ <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p>
	24	+ <p id="noscript-redirect-link"><a href="https://www.mediawiki.org//wikimediafoundation.org/wiki/DonateNonJS/en">wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
	25	+ </div>
	26	+ </noscript>
	27	+ <p id="topError" class="creditcard-error-msg"></p>
	28	+
	29	+ <form name="payment" method="post" action="@action">
	30	+ <div id="payflowpro_gateway-personal-info">
	31	+ <table id="payflow-table-donor">
	32	+ <tbody>
	33	+ <tr>
	34	+ <td colspan="2">
	35	+ <div id="step1header">
	36	+ <h3 class="amount_header">%donate_interface-amount-recurring% <span id="selected-amount">$@amount (AUD)</span></h3>
	37	+ </div>
	38	+ </td>
	39	+ </tr>
	40	+ <tr>
	41	+ <td colspan="2"><h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
	42	+ </tr>
	43	+ <tr>
	44	+ <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"></td>
	45	+ </tr>
	46	+ <tr>
	47	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	48	+ </tr>
	49	+ <tr>
	50	+ <td colspan="2"><input name="street" value="@street" type="text" placeholder="%donate_interface-donor-street%" id="street"></td>
	51	+ </tr>
	52	+ <tr>
	53	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	54	+ </tr>
	55	+ <tr>
	56	+ <!-- TODO: add "locality" to translation (probably part of a "neighborhood" type thing-->
	57	+ <td colspan="2"><input name="city" value="@city" type="text" placeholder="Locality" id="city">
	58	+ <select id="state" name="state" class="txt" value="@state" >
	59	+ <option value="">%donate_interface-donor-state%</option>
	60	+ <option value="ACT">ACT</option>
	61	+ <option value="NSW">NSW</option>
	62	+ <option value="NT">NT</option>
	63	+ <option value="QLD">QLD</option>
	64	+ <option value="SA">SA</option>
	65	+ <option value="TAS">TAS</option>
	66	+ <option value="VIC">VIC</option>
	67	+ <option value="WA">WA</option>
	68	+ </select>
	69	+ <input name="zip" value="@zip" type="text" placeholder="%donate_interface-donor-postal%" id="zip">
	70	+ </td>
	71	+ </tr>
	72	+ <tr>
	73	+ <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="%donate_interface-donor-email%" id="emailAdd"></td>
	74	+ </tr>
	75	+ <tr>
	76	+ <td>
	77	+ <dl class="">
	78	+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
	79	+ <ul class="options-h" id="cards" style="margin: 0;">
	80	+ <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>
	81	+ <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>
	82	+ <li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>
	83	+ <!--<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>-->
	84	+ <li><input id="cc-jcb" name="cardtype" type="radio" value="jcb" class="cardradio" /> <label for="cc-jcb"><img alt="JCB" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li>
	85	+ </ul>
	86	+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
	87	+ </dd>
	88	+ </dl>
	89	+ </td>
	90	+ </tr>
	91	+ <tr>
	92	+ <td>
	93	+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
	94	+ </td>
	95	+ </tr>
	96	+ <tr>
	97	+ <td>
	98	+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
	99	+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">%donate_interface-donate-click%
	100	+ </div>
	101	+ </td>
	102	+ </tr>
	103	+ </tbody>
	104	+ </table>
	105	+ </div>
	106	+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
	107	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	108	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	109	+ <input type="hidden" value="@amount" name="amount">
	110	+ <input type="hidden" value="AU" name="country" id="country" />
	111	+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
	112	+ <input type="hidden" value="AUD" name="currency_code" />
	113	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	114	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	115	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	116	+ <input type="hidden" value="@language" name="language"/>
	117	+ <input type="hidden" value="@referrer" name="referrer"/>
	118	+ <input type="hidden" value="@comment" name="comment"/>
	119	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	120	+ <input type="hidden" value="1" name="email-opt"/>
	121	+ <input type="hidden" value="@token" name="token"/>
	122	+ <input type="hidden" value="@order_id" name="order_id"/>
	123	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	124	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	125	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	126	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	127	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	128	+ <input type="hidden" value="@gateway" name="gateway"/>
	129	+ <input type="hidden" value="cc" name="payment_method"/>
	130	+ </form>
	131	+ </div>
	132	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	133	+ <table>
	134	+ <tr>
	135	+ <td>
	136	+ <ul id="moreinfolinks">
	137	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li>
	138	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li>
	139	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	140	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li>
	141	+ </ul>
	142	+ </td>
	143	+ <td>@verisign_logo</td>
	144	+ </tr>
	145	+ </table>
	146	+ </td>
	147	+ </tr>
	148	+ </tbody>
	149	+</table>
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-AU.html
___________________________________________________________________
Added: svn:eol-style
1	150	+ native

Follow-up revisions

Revision	Commit summary	Author	Date
r105620	MFT r104539, r105534, r105584, r105593, r105594, r105600, r105611	awjrichards	23:56, 8 December 2011

Status & tagging log

22:29, 8 December 2011 Awjrichards (talk | contribs) changed the status of r105593 [removed: new added: ok]