r102939 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r102938‎ \| r102939 \| r102940 >
Date:	05:08, 14 November 2011
Author:	awjrichards
Status:	deferred
Tags:
Comment:	MFT r102936, r102938
Modified paths:	/branches/fundraising/deployment/payments_1.17/extensions/DonationInterface (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd_green-US.html (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms (modified) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects2nd_green-US.html (added) (history) /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/js/webitects2nd-US.js (added) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects2nd_green-US.html
—	—	@@ -0,0 +1,214 @@
	2	+<script type="text/javascript">
	3	+ mw.loader.load('pfp.form.rapidhtml.webitects.2nd.US');
	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('pfp.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	+
	41	+ <td>
	42	+ <div id="donate">
	43	+ <div id="donate-content" style="background-color: #CCE7CD; border-color: #5EAC58;">
	44	+ <div id="donate-body" style="padding: 0 1em;">
	45	+ <form method="post" name="paypalcontribution">
	46	+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
	47	+ <div id="step1wrapper" style="display: none;">
	48	+ <div id="amtErrorMessages" class="small"></div>
	49	+ <table id="amount-table-white">
	50	+ <tr>
	51	+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">$5</span></label></td>
	52	+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">$10</span></label></td>
	53	+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">$20</span></label></td>
	54	+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="40" /> <span id="amountSpan3">$40</span></label></td>
	55	+ </tr>
	56	+ <tr>
	57	+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="55" /> <span id="amountSpan4">$55</span></label></td>
	58	+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="75" /> <span id="amountSpan5">$75</span></label></td>
	59	+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="180" /> <span id="amountSpan6">$180</span></label></td>
	60	+ <td><input type="radio" name="amountRadio" id="input_amount_other" value="other" /> <label><span id="amountSpanOther"></span><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="%donate_interface-other%" placeholder="%donate_interface-other%" onfocus="this.form.input_amount_other.checked=true;"/></label></td>
	61	+ </tr>
	62	+ </table>
	63	+ </div>
	64	+ <div id="step2header"><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>
	65	+ <div id="step2wrapper">
	66	+ <div id="billing-content" class="gainlayout">
	67	+ <div id="billingErrorMessages" class="small"></div>
	68	+ <div id="paymentErrorMessages" class="small"></div>
	69	+ <div class="name-fields">
	70	+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
	71	+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
	72	+ </div>
	73	+ <div class="loc-fields">
	74	+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
	75	+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
	76	+ <span class="loc-state">
	77	+ <select id="state" name="state" class="txt" value="@state" >
	78	+ <option value=""></option>
	79	+ <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>
	80	+ </select>
	81	+ </span>
	82	+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-zip%"/></span> <!-- TODO: use postal code on non-US -->
	83	+ </div>
	84	+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
	85	+
	86	+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" class="">
	87	+ <!--<dl class="">-->
	88	+ <!--<dt><span class="label">%donate_interface-select-credit-card%</span></dt>-->
	89	+ <!--<dd class="field" style="margin-bottom: 0;">-->
	90	+ <!--<ul class="options-h" id="cards" style="margin: 0;">-->
	91	+ <!--<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>-->
	92	+ <!--<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>-->
	93	+ <!--<li><input id="cc-amex" name="cardtype" type="radio" value="American Express" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>-->
	94	+ <!--<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>-->
	95	+ <!--</ul>-->
	96	+ <!--</dd>-->
	97	+ <!--</dl>-->
	98	+ </div>
	99	+ <!--</div>-->
	100	+ <!--<div id="step3header"><h3>%donate_interface-cc-form-header-payment% <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>-->
	101	+ <!--<div id="step3wrapper" style="display: none;">-->
	102	+ <div id="payment" class="gainlayout">
	103	+
	104	+ <dl class="form">
	105	+ <!--<dt><span class="label"><label for="card_num">Card number</label></span></dt>-->
	106	+ <dd class="field"><input class="txt" id="card_num" name="card_num" value="@card_num" placeholder="Card number"/></dd>
	107	+
	108	+ <dt></dt>
	109	+ <dd class="field">
	110	+ <div class="l" style="margin-right: 5%;">
	111	+ <span class="label">Expiration date</span>
	112	+ <select id="mos" name="mos">
	113	+ <option value="">Month</option>
	114	+ <option value="01">01 - January</option>
	115	+ <option value="02">02 - February</option>
	116	+ <option value="03">03 - March</option>
	117	+ <option value="04">04 - April</option>
	118	+ <option value="05">05 - May</option>
	119	+ <option value="06">06 - June</option>
	120	+ <option value="07">07 - July</option>
	121	+ <option value="08">08 - August</option>
	122	+ <option value="09">09 - September</option>
	123	+ <option value="10">10 - October</option>
	124	+ <option value="11">11 - November</option>
	125	+ <option value="12">12 - December</option>
	126	+ </select>
	127	+
	128	+ <select id="year" name="year">
	129	+ <option value="">Year</option>
	130	+ <option value="2011">2011</option>
	131	+ <option value="2012">2012</option>
	132	+ <option value="2013">2013</option>
	133	+ <option value="2014">2014</option>
	134	+ <option value="2015">2015</option>
	135	+ <option value="2016">2016</option>
	136	+ <option value="2017">2017</option>
	137	+ <option value="2018">2018</option>
	138	+ <option value="2019">2019</option>
	139	+ <option value="2020">2020</option>
	140	+ </select>
	141	+ </div>
	142	+ <div class="l">
	143	+ <label class="label" for="cvv">Security code</label>
	144	+ <input class="txt-sm" id="cvv" name="cvv" value="@cvv"/>
	145	+ <a class="mute" href="#" id="where">Where?</a>
	146	+ </div>
	147	+
	148	+ <div class="clear" id="codes" style="display: none;"><img alt="Security codes" src="@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png" /></div>
	149	+ </dd>
	150	+
	151	+ <dt></dt>
	152	+ <dd class="field">
	153	+ <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
	154	+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
	155	+ </dd>
	156	+ </dl>
	157	+ </div>
	158	+ </div>
	159	+
	160	+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
	161	+ <input type="hidden" name="returnto" value="Thank_You/en" />
	162	+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
	163	+ <input type="hidden" value="@card" name="card" id="card">
	164	+
	165	+ <input type="hidden" value="@amount" name="amount" />
	166	+ <input type="hidden" value="US" name="country" id="country" />
	167	+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
	168	+ <input type="hidden" value="USD" name="currency_code" />
	169	+ <input type="hidden" value="@utm_source" name="utm_source"/>
	170	+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
	171	+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
	172	+ <input type="hidden" value="@language" name="language"/>
	173	+ <input type="hidden" value="@referrer" name="referrer"/>
	174	+ <input type="hidden" value="@comment" name="comment"/>
	175	+ <input type="hidden" value="@comment-option" name="comment-option"/>
	176	+ <input type="hidden" value="1 " name="email-opt"/>
	177	+ <input type="hidden" value="@token" name="token"/>
	178	+ <input type="hidden" value="@order_id" name="order_id"/>
	179	+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
	180	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
	181	+ <input type="hidden" value="@data_hash" name="data_hash"/>
	182	+ <input type="hidden" value="@owa_session" name="owa_session"/>
	183	+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
	184	+ <!-- new required fields -->
	185	+ <input type="hidden" value="@gateway" name="gateway"/>
	186	+ <input type="hidden" value="@payment_method" name="payment_method"/>
	187	+ </form>
	188	+ <!--<div id="where-content">-->
	189	+ <!--{{LanguageSwitch\|2011FR/core-appeal-whitebox-nodiv\|@language}}-->
	190	+ <!--</div>-->
	191	+ </div>
	192	+ </div>
	193	+ <p id="informationsharing">%donate_interface-informationsharing\|url%</p>
	194	+ <table>
	195	+ <tr>
	196	+ <td>
	197	+ <ul id="moreinfolinks">
	198	+ <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>
	199	+ <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>
	200	+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
	201	+ <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>
	202	+ </ul>
	203	+ </td>
	204	+ <td>@verisign_logo</td>
	205	+ </tr>
	206	+ </table>
	207	+ </div>
	208	+ </td>
	209	+ </tr>
	210	+ </table>
	211	+</div>
	212	+
	213	+<!-- Wikimedia Project logo
	214	+<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>
	215	+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects2nd_green-US.html
___________________________________________________________________
Added: svn:eol-style
1	216	+ native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/js/webitects2nd-US.js
—	—	@@ -0,0 +1,185 @@
	2	+/*
	3	+ * The following variable are declared inline in webitects_2_3step.html:
	4	+ * amountErrors, billingErrors, paymentErrors, scriptPath, actionURL
	5	+ */
	6	+$( document ).ready( function () {
	7	+
	8	+ $( "#step2header" ).show();
	9	+ $( "#step2wrapper" ).show();
	10	+
	11	+ // check for RapidHtml errors and display, if any
	12	+ var amountErrorString = "",
	13	+ billingErrorString = "",
	14	+ paymentErrorString = "";
	15	+
	16	+ // generate formatted errors to display
	17	+ var temp = [];
	18	+ for ( var e in amountErrors )
	19	+ if ( amountErrors[e] != "" )
	20	+ temp[temp.length] = amountErrors[e];
	21	+ amountErrorString = temp.join( "<br />" );
	22	+
	23	+ temp = [];
	24	+ for ( var f in billingErrors )
	25	+ if ( billingErrors[f] != "" )
	26	+ temp[temp.length] = billingErrors[f];
	27	+ billingErrorString = temp.join( "<br />" );
	28	+
	29	+ temp = [];
	30	+ for ( var g in paymentErrors )
	31	+ if ( paymentErrors[g] != "" )
	32	+ temp[temp.length] = paymentErrors[g];
	33	+ paymentErrorString = temp.join( "<br />" );
	34	+
	35	+ // show the errors
	36	+ var prevError = false;
	37	+ if ( amountErrorString != "" ) {
	38	+ $( "#amtErrorMessages" ).html( amountErrorString );
	39	+ }
	40	+ if ( billingErrorString != "" ) {
	41	+ $( "#billingErrorMessages" ).html( billingErrorString );
	42	+ }
	43	+ if ( paymentErrorString != "" ) {
	44	+ $( "#paymentErrorMessages" ).html( paymentErrorString );
	45	+ }
	46	+
	47	+ $( "#paymentContinueBtn" ).live( "click", function() {
	48	+ if ( validate_personal( document.paypalcontribution ) ) {
	49	+ displayCreditCardForm()
	50	+ }
	51	+ } );
	52	+ // Set the cards to progress to step 3
	53	+ $( ".cardradio" ).live( "click", function() {
	54	+ if ( validate_personal( document.paypalcontribution ) ) {
	55	+ displayCreditCardForm()
	56	+ }
	57	+ else {
	58	+ // show the continue button to indicate how to get to step 3 since they
	59	+ // have already clicked on a card image
	60	+ $( "#paymentContinue" ).show();
	61	+ }
	62	+ } );
	63	+
	64	+ // init all of the header actions
	65	+ $( "#step2header" ).click( function() {
	66	+ showStep2();
	67	+ } );
	68	+ $( "#step3header" ).click( function() {
	69	+ displayCreditCardForm();
	70	+ } );
	71	+
	72	+ // check to see if amount was passed from the previous step
	73	+ var amount = $( 'input[name="amount"]' ); // get the amount field
	74	+ if( amount == null \|\| isNaN( amount.val() ) \|\| amount.val() <= 0 ){
	75	+ // the amount is not set
	76	+ $( "#step1wrapper" ).slideDown();
	77	+// $( "#selected-amount" ).html( '(' + $( 'input[name="currency_code"]' ).val() + ')' );
	78	+
	79	+ } else {
	80	+ showAmount( $( 'input[name="amount"]' ) );
	81	+ }
	82	+
	83	+ // Set selected amount to amount
	84	+ $( 'input[name="amountRadio"]' ).click( function() {
	85	+ setAmount( $( this ) );
	86	+ } );
	87	+ // reset the amount field when "other" is changed
	88	+ $( "#other-amount" ).change( function() {
	89	+ setAmount( $( this ) );
	90	+ } );
	91	+
	92	+ $( "#step1header" ).click( function() {
	93	+ $( "#step1wrapper" ).slideDown();
	94	+ $( "#change-amount" ).hide();
	95	+ } );
	96	+
	97	+
	98	+ // If the form is being reloaded, restore the amount
	99	+ var previousAmount = $( 'input[name="amount"]' ).val();
	100	+ if ( previousAmount && previousAmount > 0 ) {
	101	+ var matched = false;
	102	+ $( 'input[name="amountRadio"]' ).each( function( index ) {
	103	+ if ( $( this ).val() == previousAmount ) {
	104	+ $( this ).attr( 'checked', true );
	105	+ matched = true;
	106	+ }
	107	+ } );
	108	+ if ( !matched ) {
	109	+ $( 'input#input_amount_other' ).attr( 'checked', true );
	110	+ $( 'input#other-amount' ).val( previousAmount );
	111	+ }
	112	+ }
	113	+} );
	114	+// set the hidden amount input to the value of the selected element
	115	+function setAmount( e ) {
	116	+ $( 'input[name="amount"]' ).val( e.val() );
	117	+ showAmount( e );
	118	+}
	119	+// Display selected amount
	120	+function showAmount( e ) {
	121	+ if( e.val() == "other" ){
	122	+ e = $( "#other-amount" );
	123	+ }
	124	+ $( "#selected-amount" ).html( "$" + e.val() );
	125	+ $( "#change-amount" ).show();
	126	+}
	127	+function validateAmount() {
	128	+ var error = true;
	129	+ var amount = $( 'input[name="amount"]' ).val(); // get the amount
	130	+ // Normalize weird amount formats.
	131	+ // Don't mess with these unless you know what you're doing.
	132	+ amount = amount.replace( /[,.](\d)$/, '\:$10' );
	133	+ amount = amount.replace( /[,.](\d)(\d)$/, '\:$1$2' );
	134	+ amount = amount.replace( /[,.]/g, '' );
	135	+ amount = amount.replace( /:/, '.' );
	136	+ $( 'input[name="amount"]' ).val( amount ); // set the new amount back into the form
	137	+
	138	+ // Check amount is a real number, sets error as true (good) if no issues
	139	+ error = ( amount == null \|\| isNaN( amount ) \|\| amount.value <= 0 );
	140	+
	141	+ // Check amount is at least the minimum
	142	+ var currency_code = $( 'input[name="currency_code"]' ).val();
	143	+ if ( typeof( wgCurrencyMinimums[currency_code] ) == 'undefined' ) {
	144	+ wgCurrencyMinimums[currency_code] = 1;
	145	+ }
	146	+ if ( amount < wgCurrencyMinimums[currency_code] \|\| error ) {
	147	+ alert( 'You must contribute at least $1'.replace( '$1', wgCurrencyMinimums[currency_code] + ' ' + currency_code ) );
	148	+ error = true;
	149	+ }
	150	+ return !error;
	151	+}
	152	+window.showStep1 = function() {
	153	+ // show the correct sections
	154	+ $( "#step1wrapper" ).slideDown();
	155	+ $( "#step2wrapper" ).slideUp();
	156	+ $( "#step3wrapper" ).slideUp();
	157	+ $( "#change-amount" ).hide();
	158	+ $( "#change-billing" ).show();
	159	+ $( "#change-payment" ).show();
	160	+ $( "#step1header" ).show(); // just in case
	161	+}
	162	+
	163	+window.showStep2 = function() {
	164	+ if ( $( '#step3wrapper' ).is(":visible") ) {
	165	+ $( "#paymentContinue" ).show(); // Show continue button in 2nd section
	166	+ }
	167	+ // show the correct sections
	168	+ $( "#step1wrapper" ).slideUp();
	169	+ $( "#step2wrapper" ).slideDown();
	170	+ $( "#step3wrapper" ).slideUp();
	171	+ $( "#change-amount" ).show();
	172	+ $( "#change-billing" ).hide();
	173	+ $( "#change-payment" ).show();
	174	+ $( "#step2header" ).show(); // just in case
	175	+}
	176	+
	177	+window.showStep3 = function() {
	178	+ // show the correct sections
	179	+ $( "#step1wrapper" ).slideUp();
	180	+ $( "#step2wrapper" ).slideUp();
	181	+ $( "#step3wrapper" ).slideDown();
	182	+ $( "#change-amount" ).show();
	183	+ $( "#change-billing" ).show();
	184	+ $( "#change-payment" ).hide();
	185	+ $( "#step3header" ).show(); // just in case
	186	+}
\ No newline at end of file
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/js/webitects2nd-US.js
___________________________________________________________________
Added: svn:eol-style
1	187	+ native
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms
___________________________________________________________________
Modified: svn:mergeinfo
2	188	Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms:r102936,102938
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway
___________________________________________________________________
Modified: svn:mergeinfo
3	189	Merged /trunk/extensions/DonationInterface/payflowpro_gateway:r102936,102938
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
—	—	@@ -143,6 +143,16 @@
144	144	'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
145	145	'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
146	146	);
	147	+$wgResourceModules[ 'pfp.form.rapidhtml.webitects.2nd.US' ] = array(
	148	+ 'styles' => '',
	149	+ 'scripts' => 'js/webitects2nd-US.js',
	150	+ 'dependencies' => array(
	151	+ 'pfp.form.rapidhtml.webitects',
	152	+ 'di.form.core.validate'
	153	+ ),
	154	+ 'localBasePath' => dirname( __FILE__ ).'/../../payflowpro_gateway/forms',
	155	+ 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath,
	156	+);
147	157	$wgResourceModules[ 'pfp.form.rapidhtml.webitects_2step' ] = array(
148	158	'styles' => '',
149	159	'scripts' => 'js/webitects_2_2step.js',
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms
___________________________________________________________________
Modified: svn:mergeinfo
150	160	Merged /trunk/extensions/DonationInterface/gateway_forms:r102936,102938
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd_green-US.html
—	—	@@ -36,6 +36,7 @@
37	37	</div>
38	38	</div>
39	39	</td>
	40	+
40	41	<td>
41	42	<div id="donate">
42	43	<div id="donate-content" style="background-color: #CCE7CD; border-color: #5EAC58;">
—	—	@@ -124,9 +125,9 @@
125	126	<input type="hidden" value="@gateway" name="gateway"/>
126	127	<input type="hidden" value="@payment_method" name="payment_method"/>
127	128	</form>
128		~~- <div id="where-content">~~
129		~~- {{LanguageSwitch\|2011FR/core-appeal-whitebox-nodiv\|@language}}~~
130		~~- </div>~~
	129	+ <!--<div id="where-content">-->
	130	+ <!--{{LanguageSwitch\|2011FR/core-appeal-whitebox-nodiv\|@language}}-->
	131	+ <!--</div>-->
131	132	</div>
132	133	</div>
133	134	<p id="informationsharing">%donate_interface-informationsharing\|url%</p>
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
134	135	Merged /trunk/extensions/DonationInterface:r102936,102938

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r102936	PFP form to test against GC	pgehres	04:50, 14 November 2011
r102938	And a few more little things before the test	pgehres	05:05, 14 November 2011

Status & tagging log

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