r103986 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r103985‎ \| r103986 \| r103987 >
Date:	00:08, 23 November 2011
Author:	khorn
Status:	deferred
Tags:
Comment:	MFT r103871, r103960, r103963, r103972, r103983
Modified paths:	/branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/cc (added) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/ew (added) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/ew/ew-webmoney.html (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html
—	—	@@ -0,0 +1,137 @@
	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">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
	23	+ </div>
	24	+ </noscript>
	25	+ <p id="topError" class="creditcard-error-msg"></p>
	26	+
	27	+ <form name="payment" method="post" action="@action">
	28	+ <div id="payflowpro_gateway-personal-info">
	29	+ <table id="payflow-table-donor">
	30	+ <tbody>
	31	+ <tr>
	32	+ <td colspan="2">
	33	+ <div id="step1header">
	34	+ <h3 class="amount_header">Donation amount: <span id="selected-amount">$@amount</span></h3>
	35	+ </div>
	36	+ </td>
	37	+ </tr>
	38	+ <tr>
	39	+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
	40	+ </tr>
	41	+ <tr>
	42	+ <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="First name" id="fname"><input name="lname" value="@lname" type="text" placeholder="Last name" id="lname"></td>
	43	+ </tr>
	44	+ <tr>
	45	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	46	+ </tr>
	47	+ <tr>
	48	+ <td colspan="2"><input name="street" value="@street" type="text" placeholder="Street" id="street"></td>
	49	+ </tr>
	50	+ <tr>
	51	+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
	52	+ </tr>
	53	+ <tr>
	54	+ <td colspan="2"><input name="city" value="@city" type="text" placeholder="City" id="city">
	55	+ <select id="state" name="state" value="@state" >
	56	+ <option value=""></option>
	57	+ <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
	58	+ </select>
	59	+ <input name="zip" value="@zip" type="text" placeholder="Zip code" id="zip">
	60	+ </td>
	61	+ </tr>
	62	+ <tr>
	63	+ <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" id="emailAdd"></td>
	64	+ </tr>
	65	+ <tr>
	66	+ <td>
	67	+ <dl class="">
	68	+ <dd class="field" style="margin-bottom: 0; margin-left: 0;">
	69	+ <ul class="options-h" id="cards" style="margin: 0;">
	70	+ <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>
	71	+ <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>
	72	+ <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>
	73	+ <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>
	74	+ </ul>
	75	+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
	76	+ </dd>
	77	+ </dl>
	78	+ </td>
	79	+ </tr>
	80	+ <tr>
	81	+ <td>
	82	+ <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div>
	83	+ </td>
	84	+ </tr>
	85	+ <tr>
	86	+ <td>
	87	+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
	88	+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
	89	+ </div>
	90	+ </td>
	91	+ </tr>
	92	+ </tbody>
	93	+ </table>
	94	+ </div>
	95	+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
	96	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	97	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	98	+ <input type="hidden" value="@amount" name="amount">
	99	+ <input type="hidden" value="US" name="country" id="country" />
	100	+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
	101	+ <input type="hidden" value="USD" name="currency_code" />
	102	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	103	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	104	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	105	+ <input type="hidden" value="@language" name="language"/>
	106	+ <input type="hidden" value="@referrer" name="referrer"/>
	107	+ <input type="hidden" value="@comment" name="comment"/>
	108	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	109	+ <input type="hidden" value="1" name="email-opt"/>
	110	+ <input type="hidden" value="@token" name="token"/>
	111	+ <input type="hidden" value="@order_id" name="order_id"/>
	112	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	113	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	114	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	115	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	116	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	117	+ <input type="hidden" value="@gateway" name="gateway"/>
	118	+ <input type="hidden" value="cc" name="payment_method"/>
	119	+ </form>
	120	+ </div>
	121	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	122	+ <table>
	123	+ <tr>
	124	+ <td>
	125	+ <ul id="moreinfolinks">
	126	+ <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>
	127	+ <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>
	128	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	129	+ <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>
	130	+ </ul>
	131	+ </td>
	132	+ <td>@verisign_logo</td>
	133	+ </tr>
	134	+ </table>
	135	+ </td>
	136	+ </tr>
	137	+ </tbody>
	138	+</table>
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/cc/cc-US.html
___________________________________________________________________
Added: svn:eol-style
1	139	+ native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/ew/ew-webmoney.html
—	—	@@ -0,0 +1,169 @@
	2	+<script type="text/javascript">
	3	+ mw.loader.load('gc.form.rapidhtml.webitects.bt');
	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	+<!--[if lt IE 7]>
	12	+<script type="text/javascript">
	13	+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
	14	+</script>
	15	+<style type="text/css">
	16	+ body{
	17	+ behavior: url("@script_path/skins/vector/csshover.min.htc");
	18	+ }
	19	+</style><![endif]-->
	20	+<!--[if IE 7]>
	21	+<style>
	22	+ .gainlayout {
	23	+ zoom: 1;
	24	+ height: 1%;
	25	+ }
	26	+</style>
	27	+<![endif]-->
	28	+
	29	+<div class="ltr">
	30	+ <table id="layouttable">
	31	+ <tr>
	32	+ <td>
	33	+ <div id="appeal">
	34	+ <div id="appeal-content">
	35	+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch\|2011FR/@appeal/title\|@language}}</span></h2>
	36	+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch\|2011FR/@appeal/text\|@language}}</div>
	37	+ </div>
	38	+ </div>
	39	+ </td>
	40	+ <td>
	41	+ <div id="donate">
	42	+ <div id="donate-content">
	43	+ <div id="donate-body" style="padding: 0 1em;">
	44	+ <form method="post" name="paypalcontribution">
	45	+
	46	+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span></h3></div>
	47	+
	48	+ <div id="step2header"><h3>%donate_interface-cc-form-header-payment% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
	49	+ <div id="step2wrapper">
	50	+ <div id="billing-content" class="gainlayout">
	51	+ <div id="billingErrorMessages" class="small"></div>
	52	+ <div id="paymentErrorMessages" class="small"></div>
	53	+ <div id="amtErrorMessages" class="small"></div>
	54	+ <!--<div class="name-fields">-->
	55	+ <!--<span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>-->
	56	+ <!--<span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>-->
	57	+ <!--</div>-->
	58	+ <div class="nostate">
	59	+ <!--<span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>-->
	60	+ <!--<span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-donor-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>-->
	61	+ <!--<span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>-->
	62	+ <span class="loc-country-wm">
	63	+ <select class="txt" id="country" name="country" value="@country" placeholder="%donate_interface-country%">
	64	+ <option value="">%donate_interface-select-country%</option>
	65	+ <option value="AT">%donate_interface-country-dropdown-AT%</option>
	66	+ <option value="CY">%donate_interface-country-dropdown-CY%</option>
	67	+ <option value="DE">%donate_interface-country-dropdown-DE%</option>
	68	+ <option value="EC">%donate_interface-country-dropdown-EC%</option>
	69	+ <option value="ES">%donate_interface-country-dropdown-ES%</option>
	70	+ <option value="FI">%donate_interface-country-dropdown-FI%</option>
	71	+ <option value="FR">%donate_interface-country-dropdown-FR%</option>
	72	+ <option value="GR">%donate_interface-country-dropdown-GR%</option>
	73	+ <option value="IE">%donate_interface-country-dropdown-IE%</option>
	74	+ <option value="ME">%donate_interface-country-dropdown-ME%</option>
	75	+ <option value="MT">%donate_interface-country-dropdown-MT%</option>
	76	+ <option value="RU">%donate_interface-country-dropdown-RU%</option>
	77	+ <option value="SI">%donate_interface-country-dropdown-SI%</option>
	78	+ <option value="UA">%donate_interface-country-dropdown-UA%</option>
	79	+ </select>
	80	+ </span>
	81	+
	82	+ <span class="ew-currency">
	83	+ <select class="txt" id="currency_code" name="currency_code" value="@currency_code" >
	84	+ <option value="USD">USD</option>
	85	+ <option value="EUR">EUR</option>
	86	+ <option value="RUB">RUB</option>
	87	+ <option value="UAH">UAH</option>
	88	+ <option value="UZS">UZS</option>
	89	+ </select>
	90	+ </span>
	91	+
	92	+
	93	+ </div>
	94	+ <!--<p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/> </p>-->
	95	+ <table style="margin-top: 10px;" >
	96	+ <tr><td>
	97	+ <div id="bt-continue" style="margin-top: 7px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
	98	+ </td><td>
	99	+ <img style="margin-left: 40px; width:150px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/wmlogo_blue.png" alt="WebMoney">
	100	+ </td></tr>
	101	+ </table>
	102	+ </div>
	103	+ </div>
	104	+
	105	+
	106	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	107	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	108	+
	109	+ <input type="hidden" value="@amount" name="amount" />
	110	+ <!--<input type="hidden" value="EUR" name="currency_code" />-->
	111	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	112	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	113	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	114	+ <input type="hidden" value="@language" name="language"/>
	115	+ <input type="hidden" value="@referrer" name="referrer"/>
	116	+ <input type="hidden" value="@comment" name="comment"/>
	117	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	118	+ <input type="hidden" value="1" name="email-opt"/>
	119	+ <input type="hidden" value="@token" name="token"/>
	120	+ <input type="hidden" value="@order_id" name="order_id"/>
	121	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	122	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	123	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	124	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	125	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	126	+ <!-- new required fields -->
	127	+ <input type="hidden" value="@gateway" name="gateway"/>
	128	+ <!-- required fields for bt and dd -->
	129	+ <input type="hidden" value="ew" name="payment_method"/>
	130	+ <input type="hidden" value="ew_webmoney" name="payment_submethod"/>
	131	+ <!-- required fields omitted above -->
	132	+ <input type="hidden" value="John" name="fname" id="fname" />
	133	+ <input type="hidden" value="Doe" name="lname" id="lname" />
	134	+ <input type="hidden" value="n/a" name="street" id="street" />
	135	+ <input type="hidden" value="n/a" name="city" id="city" />
	136	+ <input type="hidden" value="XX" name="state" id="state" />
	137	+ <input type="hidden" value="00000" name="zip" id="zip" />
	138	+ <input type="hidden" value="nobody@wikimedia.org" name="emailAdd" id="emailAdd" />
	139	+ </form>
	140	+ <div id="where-content">
	141	+ {{LanguageSwitch\|2011FR/core-appeal-whitebox-nodiv\|@language}}
	142	+ </div>
	143	+ </div>
	144	+ </div>
	145	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	146	+ <table>
	147	+ <tr>
	148	+ <td>
	149	+ <ul id="moreinfolinks">
	150	+ <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>
	151	+ <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>
	152	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	153	+ <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>
	154	+ </ul>
	155	+ </td>
	156	+ <td>@verisign_logo</td>
	157	+ </tr>
	158	+ </table>
	159	+ </div>
	160	+ </td>
	161	+ </tr>
	162	+ </table>
	163	+
	164	+
	165	+
	166	+</div>
	167	+
	168	+<!-- Wikimedia Project logo
	169	+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
	170	+ -->

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r103871	add webmoney form	jamesur	23:48, 21 November 2011
r103960	Adding new GC credit card form	pgehres	21:40, 22 November 2011
r103963	A few minor fixes to the new gc form. FU r103960	pgehres	21:53, 22 November 2011
r103972	Removing calls to now-unused functions FU r103960	pgehres	22:52, 22 November 2011
r103983	Fixes for ew-webmoney	pgehres	23:51, 22 November 2011

Status & tagging log

12:34, 7 December 2011 Siebrand (talk | contribs) changed the status of r103986 [removed: new added: deferred]