r102231 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r102230‎ | r102231 | r102232 >
Date:02:37, 7 November 2011
Author:pgehres
Status:ok
Tags:
Comment:
Adding generic 2nd step gc credit card form
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd.html (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects2nd.js (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php
——@@ -98,6 +98,7 @@
9999 );
100100 $wgResourceModules[ 'gc.form.rapidhtml.webitects.2nd' ] = array(
101101 'styles' => '',
 102+ 'scripts' => 'js/webitects2nd.js',
102103 'dependencies' => array(
103104 'gc.form.rapidhtml.webitects',
104105 'di.form.rapidhtml.webitects.2nd'
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects2nd.js
——@@ -0,0 +1,136 @@
 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+ // check for RapidHtml errors and display, if any
 9+ var amountErrorString = "",
 10+ billingErrorString = "",
 11+ paymentErrorString = "";
 12+
 13+ // generate formatted errors to display
 14+ var temp = [];
 15+ for ( var e in amountErrors )
 16+ if ( amountErrors[e] != "" )
 17+ temp[temp.length] = amountErrors[e];
 18+ amountErrorString = temp.join( "<br />" );
 19+
 20+ temp = [];
 21+ for ( var f in billingErrors )
 22+ if ( billingErrors[f] != "" )
 23+ temp[temp.length] = billingErrors[f];
 24+ billingErrorString = temp.join( "<br />" );
 25+
 26+ temp = [];
 27+ for ( var g in paymentErrors )
 28+ if ( paymentErrors[g] != "" )
 29+ temp[temp.length] = paymentErrors[g];
 30+ paymentErrorString = temp.join( "<br />" );
 31+
 32+ // show the errors
 33+ var prevError = false;
 34+ if ( amountErrorString != "" ) {
 35+ $( "#amtErrorMessages" ).html( amountErrorString );
 36+ prevError = true;
 37+ showStep2(); // init the headers
 38+ showStep3();
 39+ showStep1(); // should be default, but ensure
 40+ }
 41+ if ( billingErrorString != "" ) {
 42+ $( "#billingErrorMessages" ).html( billingErrorString );
 43+ if ( !prevError ) {
 44+ showStep1(); // init the headers
 45+ showStep3();
 46+ showStep2();
 47+ prevError = true;
 48+ }
 49+ showAmount( $( 'input[name="amount"]' ) ); // lets go ahead and assume there is something to show
 50+ }
 51+ if ( paymentErrorString != "" ) {
 52+ $( "#paymentErrorMessages" ).html( paymentErrorString );
 53+ if ( !prevError ) {
 54+ showStep1(); // init the headers
 55+ showStep2();
 56+ showStep3();
 57+ }
 58+ showAmount( $( 'input[name="amount"]' ) ); // lets go ahead and assume there is something to show
 59+ }
 60+
 61+ $( "#paymentContinueBtn" ).live( "click", function() {
 62+ if ( validate_personal( document.paypalcontribution ) ) {
 63+ displayCreditCardForm()
 64+ }
 65+ } );
 66+ // Set the cards to progress to step 3
 67+ $( ".cardradio" ).live( "click", function() {
 68+ if ( validate_personal( document.paypalcontribution ) ) {
 69+ displayCreditCardForm()
 70+ }
 71+ else {
 72+ // show the continue button to indicate how to get to step 3 since they
 73+ // have already clicked on a card image
 74+ $( "#paymentContinue" ).show();
 75+ }
 76+ } );
 77+
 78+ // init all of the header actions
 79+ $( "#step1header" ).click( function() {
 80+ showStep1();
 81+ } );
 82+ $( "#step2header" ).click( function() {
 83+ showStep2();
 84+ } );
 85+ // Set selected amount to amount
 86+ $( 'input[name="amountRadio"]' ).click( function() {
 87+ setAmount( $( this ) );
 88+ } );
 89+ // reset the amount field when "other" is changed
 90+ $( "#other-amount" ).change( function() {
 91+ setAmount( $( this ) );
 92+ } );
 93+
 94+ // show the CVV help image on click
 95+ $( "#where" ).click( function() {
 96+ $( "#codes" ).toggle();
 97+ return false;
 98+ } );
 99+
 100+} );
 101+
 102+
 103+window.showStep1 = function() {
 104+ // show the correct sections
 105+ $( "#step1wrapper" ).slideDown();
 106+ $( "#step2wrapper" ).slideUp();
 107+ $( "#step3wrapper" ).slideUp();
 108+ $( "#change-amount" ).hide();
 109+ $( "#change-billing" ).show();
 110+ $( "#change-payment" ).show();
 111+ $( "#step1header" ).show(); // just in case
 112+}
 113+
 114+window.showStep2 = function() {
 115+ if ( $( '#step3wrapper' ).is(":visible") ) {
 116+ $( "#paymentContinue" ).show(); // Show continue button in 2nd section
 117+ }
 118+ // show the correct sections
 119+ $( "#step1wrapper" ).slideUp();
 120+ $( "#step2wrapper" ).slideDown();
 121+ $( "#step3wrapper" ).slideUp();
 122+ $( "#change-amount" ).show();
 123+ $( "#change-billing" ).hide();
 124+ $( "#change-payment" ).show();
 125+ $( "#step2header" ).show(); // just in case
 126+}
 127+
 128+window.showStep3 = function() {
 129+ // show the correct sections
 130+ $( "#step1wrapper" ).slideUp();
 131+ $( "#step2wrapper" ).slideUp();
 132+ $( "#step3wrapper" ).slideDown();
 133+ $( "#change-amount" ).show();
 134+ $( "#change-billing" ).show();
 135+ $( "#change-payment" ).hide();
 136+ $( "#step3header" ).show(); // just in case
 137+}
\ No newline at end of file
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects2nd.js
___________________________________________________________________
Added: svn:eol-style
1138 + native
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd.html
——@@ -50,16 +50,25 @@
5151 <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
5252 <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
5353 </div>
54 - <div class="loc-fields">
 54+ <div class="loc-fields nostate">
5555 <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
5656 <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
57 - <span class="loc-state">
58 - <select id="state" name="state" class="txt" value="@state" >
59 - <option value=""></option>
60 - <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>
61 - </select>
 57+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>
 58+ <span class="loc-country">
 59+ <select class="txt" id="country" name="country" value="@country" placeholder="%donate_interface-country%">
 60+ <option value="">%donate_interface-select-country%</option>
 61+ <option value="AF">%donate_interface-country-dropdown-AF%</option><option value="AL">%donate_interface-country-dropdown-AL%</option><option value="DZ">%donate_interface-country-dropdown-DZ%</option><option value="AS">%donate_interface-country-dropdown-AS%</option><option value="AD">%donate_interface-country-dropdown-AD%</option><option value="AO">%donate_interface-country-dropdown-AO%</option><option value="AI">%donate_interface-country-dropdown-AI%</option><option value="AQ">%donate_interface-country-dropdown-AQ%</option><option value="AG">%donate_interface-country-dropdown-AG%</option><option value="AR">%donate_interface-country-dropdown-AR%</option><option value="AM">%donate_interface-country-dropdown-AM%</option><option value="AW">%donate_interface-country-dropdown-AW%</option><option value="AU">%donate_interface-country-dropdown-AU%</option><option value="AT">%donate_interface-country-dropdown-AT%</option><option value="AZ">%donate_interface-country-dropdown-AZ%</option><option value="BS">%donate_interface-country-dropdown-BS%</option><option value="BH">%donate_interface-country-dropdown-BH%</option><option value="BD">%donate_interface-country-dropdown-BD%</option><option value="BB">%donate_interface-country-dropdown-BB%</option><option value="BY">%donate_interface-country-dropdown-BY%</option><option value="BE">%donate_interface-country-dropdown-BE%</option><option value="BZ">%donate_interface-country-dropdown-BZ%</option><option value="BJ">%donate_interface-country-dropdown-BJ%</option><option value="BM">%donate_interface-country-dropdown-BM%</option><option value="BT">%donate_interface-country-dropdown-BT%</option>
 62+ <option value="BO">%donate_interface-country-dropdown-BO%</option><option value="BA">%donate_interface-country-dropdown-BA%</option><option value="BW">%donate_interface-country-dropdown-BW%</option><option value="BV">%donate_interface-country-dropdown-BV%</option><option value="BR">%donate_interface-country-dropdown-BR%</option><option value="IN">%donate_interface-country-dropdown-IN%</option><option value="BN">%donate_interface-country-dropdown-BN%</option><option value="BG">%donate_interface-country-dropdown-BG%</option><option value="BF">%donate_interface-country-dropdown-BF%</option><option value="BI">%donate_interface-country-dropdown-BI%</option><option value="KH">%donate_interface-country-dropdown-KH%</option><option value="CM">%donate_interface-country-dropdown-CM%</option><option value="CA">%donate_interface-country-dropdown-CA%</option><option value="CV">%donate_interface-country-dropdown-CV%</option><option value="KY">%donate_interface-country-dropdown-KY%</option><option value="CF">%donate_interface-country-dropdown-CF%</option><option value="TD">%donate_interface-country-dropdown-TD%</option><option value="CL">%donate_interface-country-dropdown-CL%</option><option value="CN">%donate_interface-country-dropdown-CN%</option><option value="CX">%donate_interface-country-dropdown-CX%</option><option value="CC">%donate_interface-country-dropdown-CC%</option><option value="CO">%donate_interface-country-dropdown-CO%</option><option value="KM">%donate_interface-country-dropdown-KM%</option><option value="CG">%donate_interface-country-dropdown-CG%</option><option value="CD">%donate_interface-country-dropdown-CD%</option>
 63+ <option value="CK">%donate_interface-country-dropdown-CK%</option><option value="CR">%donate_interface-country-dropdown-CR%</option><option value="HR">%donate_interface-country-dropdown-HR%</option><option value="CY">%donate_interface-country-dropdown-CY%</option><option value="CZ">%donate_interface-country-dropdown-CZ%</option><option value="CI">%donate_interface-country-dropdown-CI%</option><option value="DK">%donate_interface-country-dropdown-DK%</option><option value="DJ">%donate_interface-country-dropdown-DJ%</option><option value="DM">%donate_interface-country-dropdown-DM%</option><option value="DO">%donate_interface-country-dropdown-DO%</option><option value="EC">%donate_interface-country-dropdown-EC%</option><option value="EG">%donate_interface-country-dropdown-EG%</option><option value="SV">%donate_interface-country-dropdown-SV%</option><option value="GQ">%donate_interface-country-dropdown-GQ%</option><option value="ER">%donate_interface-country-dropdown-ER%</option><option value="EE">%donate_interface-country-dropdown-EE%</option><option value="ET">%donate_interface-country-dropdown-ET%</option><option value="FK">%donate_interface-country-dropdown-FK%</option><option value="FO">%donate_interface-country-dropdown-FO%</option><option value="FJ">%donate_interface-country-dropdown-FJ%</option><option value="FI">%donate_interface-country-dropdown-FI%</option><option value="FR">%donate_interface-country-dropdown-FR%</option><option value="GF">%donate_interface-country-dropdown-GF%</option><option value="PF">%donate_interface-country-dropdown-PF%</option><option value="TF">%donate_interface-country-dropdown-TF%</option>
 64+ <option value="GA">%donate_interface-country-dropdown-GA%</option><option value="GM">%donate_interface-country-dropdown-GM%</option><option value="GE">%donate_interface-country-dropdown-GE%</option><option value="DE">%donate_interface-country-dropdown-DE%</option><option value="GH">%donate_interface-country-dropdown-GH%</option><option value="GI">%donate_interface-country-dropdown-GI%</option><option value="GR">%donate_interface-country-dropdown-GR%</option><option value="GL">%donate_interface-country-dropdown-GL%</option><option value="GD">%donate_interface-country-dropdown-GD%</option><option value="GP">%donate_interface-country-dropdown-GP%</option><option value="GU">%donate_interface-country-dropdown-GU%</option><option value="GT">%donate_interface-country-dropdown-GT%</option><option value="GN">%donate_interface-country-dropdown-GN%</option><option value="GW">%donate_interface-country-dropdown-GW%</option><option value="GY">%donate_interface-country-dropdown-GY%</option><option value="HT">%donate_interface-country-dropdown-HT%</option><option value="HM">%donate_interface-country-dropdown-HM%</option><option value="VA">%donate_interface-country-dropdown-VA%</option><option value="HN">%donate_interface-country-dropdown-HN%</option><option value="HK">%donate_interface-country-dropdown-HK%</option><option value="HU">%donate_interface-country-dropdown-HU%</option><option value="IS">%donate_interface-country-dropdown-IS%</option><option value="IN">%donate_interface-country-dropdown-IN%</option><option value="ID">%donate_interface-country-dropdown-ID%</option><option value="IQ">%donate_interface-country-dropdown-IQ%</option>
 65+ <option value="IE">%donate_interface-country-dropdown-IE%</option><option value="IL">%donate_interface-country-dropdown-IL%</option><option value="IT">%donate_interface-country-dropdown-IT%</option><option value="JM">%donate_interface-country-dropdown-JM%</option><option value="JP">%donate_interface-country-dropdown-JP%</option><option value="JO">%donate_interface-country-dropdown-JO%</option><option value="KZ">%donate_interface-country-dropdown-KZ%</option><option value="KE">%donate_interface-country-dropdown-KE%</option><option value="KI">%donate_interface-country-dropdown-KI%</option><option value="KW">%donate_interface-country-dropdown-KW%</option><option value="KG">%donate_interface-country-dropdown-KG%</option><option value="LA">%donate_interface-country-dropdown-LA%</option><option value="LV">%donate_interface-country-dropdown-LV%</option><option value="LB">%donate_interface-country-dropdown-LB%</option><option value="LS">%donate_interface-country-dropdown-LS%</option><option value="LR">%donate_interface-country-dropdown-LR%</option><option value="LY">%donate_interface-country-dropdown-LY%</option><option value="LI">%donate_interface-country-dropdown-LI%</option><option value="LT">%donate_interface-country-dropdown-LT%</option><option value="LU">%donate_interface-country-dropdown-LU%</option><option value="MO">%donate_interface-country-dropdown-MO%</option><option value="MK">%donate_interface-country-dropdown-MK%</option><option value="MG">%donate_interface-country-dropdown-MG%</option><option value="MW">%donate_interface-country-dropdown-MW%</option><option value="MY">%donate_interface-country-dropdown-MY%</option>
 66+ <option value="MV">%donate_interface-country-dropdown-MV%</option><option value="ML">%donate_interface-country-dropdown-ML%</option><option value="MT">%donate_interface-country-dropdown-MT%</option><option value="MH">%donate_interface-country-dropdown-MH%</option><option value="MQ">%donate_interface-country-dropdown-MQ%</option><option value="MR">%donate_interface-country-dropdown-MR%</option><option value="MU">%donate_interface-country-dropdown-MU%</option><option value="YT">%donate_interface-country-dropdown-YT%</option><option value="MX">%donate_interface-country-dropdown-MX%</option><option value="FM">%donate_interface-country-dropdown-FM%</option><option value="MC">%donate_interface-country-dropdown-MC%</option><option value="MD">%donate_interface-country-dropdown-MD%</option><option value="MN">%donate_interface-country-dropdown-MN%</option><option value="MS">%donate_interface-country-dropdown-MS%</option><option value="MA">%donate_interface-country-dropdown-MA%</option><option value="MZ">%donate_interface-country-dropdown-MZ%</option><option value="MM">%donate_interface-country-dropdown-MM%</option><option value="NA">%donate_interface-country-dropdown-NA%</option><option value="NR">%donate_interface-country-dropdown-NR%</option><option value="NP">%donate_interface-country-dropdown-NP%</option><option value="NL">%donate_interface-country-dropdown-NL%</option><option value="AN">%donate_interface-country-dropdown-AN%</option><option value="NC">%donate_interface-country-dropdown-NC%</option><option value="NZ">%donate_interface-country-dropdown-NZ%</option><option value="NI">%donate_interface-country-dropdown-NI%</option>
 67+ <option value="NE">%donate_interface-country-dropdown-NE%</option><option value="NG">%donate_interface-country-dropdown-NG%</option><option value="NU">%donate_interface-country-dropdown-NU%</option><option value="NF">%donate_interface-country-dropdown-NF%</option><option value="KP">%donate_interface-country-dropdown-KP%</option><option value="MP">%donate_interface-country-dropdown-MP%</option><option value="NO">%donate_interface-country-dropdown-NO%</option><option value="OM">%donate_interface-country-dropdown-OM%</option><option value="PK">%donate_interface-country-dropdown-PK%</option><option value="PW">%donate_interface-country-dropdown-PW%</option><option value="PS">%donate_interface-country-dropdown-PS%</option><option value="PA">%donate_interface-country-dropdown-PA%</option><option value="PG">%donate_interface-country-dropdown-PG%</option><option value="PY">%donate_interface-country-dropdown-PY%</option><option value="PE">%donate_interface-country-dropdown-PE%</option><option value="PH">%donate_interface-country-dropdown-PH%</option><option value="PN">%donate_interface-country-dropdown-PN%</option><option value="PL">%donate_interface-country-dropdown-PL%</option><option value="PT">%donate_interface-country-dropdown-PT%</option><option value="PR">%donate_interface-country-dropdown-PR%</option><option value="QA">%donate_interface-country-dropdown-QA%</option><option value="RE">%donate_interface-country-dropdown-RE%</option><option value="RO">%donate_interface-country-dropdown-RO%</option><option value="RU">%donate_interface-country-dropdown-RU%</option><option value="RW">%donate_interface-country-dropdown-RW%</option>
 68+ <option value="SH">%donate_interface-country-dropdown-SH%</option><option value="KN">%donate_interface-country-dropdown-KN%</option><option value="LC">%donate_interface-country-dropdown-LC%</option><option value="PM">%donate_interface-country-dropdown-PM%</option><option value="VC">%donate_interface-country-dropdown-VC%</option><option value="WS">%donate_interface-country-dropdown-WS%</option><option value="SM">%donate_interface-country-dropdown-SM%</option><option value="ST">%donate_interface-country-dropdown-ST%</option><option value="SA">%donate_interface-country-dropdown-SA%</option><option value="SN">%donate_interface-country-dropdown-SN%</option><option value="CS">%donate_interface-country-dropdown-CS%</option><option value="SC">%donate_interface-country-dropdown-SC%</option><option value="SL">%donate_interface-country-dropdown-SL%</option><option value="SG">%donate_interface-country-dropdown-SG%</option><option value="SK">%donate_interface-country-dropdown-SK%</option><option value="SI">%donate_interface-country-dropdown-SI%</option><option value="SB">%donate_interface-country-dropdown-SB%</option><option value="SO">%donate_interface-country-dropdown-SO%</option><option value="ZA">%donate_interface-country-dropdown-ZA%</option><option value="KR">%donate_interface-country-dropdown-KR%</option><option value="ES">%donate_interface-country-dropdown-ES%</option><option value="LK">%donate_interface-country-dropdown-LK%</option><option value="SD">%donate_interface-country-dropdown-SD%</option><option value="SR">%donate_interface-country-dropdown-SR%</option><option value="SJ">%donate_interface-country-dropdown-SJ%</option>
 69+ <option value="SZ">%donate_interface-country-dropdown-SZ%</option><option value="SE">%donate_interface-country-dropdown-SE%</option><option value="CH">%donate_interface-country-dropdown-CH%</option><option value="TW">%donate_interface-country-dropdown-TW%</option><option value="TJ">%donate_interface-country-dropdown-TJ%</option><option value="TZ">%donate_interface-country-dropdown-TZ%</option><option value="TH">%donate_interface-country-dropdown-TH%</option><option value="TL">%donate_interface-country-dropdown-TL%</option><option value="TG">%donate_interface-country-dropdown-TG%</option><option value="TK">%donate_interface-country-dropdown-TK%</option><option value="TO">%donate_interface-country-dropdown-TO%</option><option value="TT">%donate_interface-country-dropdown-TT%</option><option value="TN">%donate_interface-country-dropdown-TN%</option><option value="TR">%donate_interface-country-dropdown-TR%</option><option value="TM">%donate_interface-country-dropdown-TM%</option><option value="TC">%donate_interface-country-dropdown-TC%</option><option value="TV">%donate_interface-country-dropdown-TV%</option><option value="UG">%donate_interface-country-dropdown-UG%</option><option value="UA">%donate_interface-country-dropdown-UA%</option><option value="AE">%donate_interface-country-dropdown-AE%</option><option value="GB">%donate_interface-country-dropdown-GB%</option><option value="US">%donate_interface-country-dropdown-US%</option><option value="UM">%donate_interface-country-dropdown-UM%</option><option value="UY">%donate_interface-country-dropdown-UY%</option><option value="UZ">%donate_interface-country-dropdown-UZ%</option>
 70+ <option value="VU">%donate_interface-country-dropdown-VU%</option><option value="VE">%donate_interface-country-dropdown-VE%</option><option value="VN">%donate_interface-country-dropdown-VN%</option><option value="VG">%donate_interface-country-dropdown-VG%</option><option value="VI">%donate_interface-country-dropdown-VI%</option><option value="WF">%donate_interface-country-dropdown-WF%</option><option value="EH">%donate_interface-country-dropdown-EH%</option><option value="YE">%donate_interface-country-dropdown-YE%</option><option value="ZM">%donate_interface-country-dropdown-ZM%</option><option value="ZW">%donate_interface-country-dropdown-ZW%</option>
 71+ </select>
6272 </span>
63 - <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-donor-zip%"/></span> <!-- TODO: use postal code on non-US -->
6473 </div>
6574 <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
6675
——@@ -86,7 +95,7 @@
8796 <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
8897
8998 <input type="hidden" value="@amount" name="amount" />
90 - <input type="hidden" value="@country" name="country" id="country" />
 99+ <!--<input type="hidden" value="@country" name="country" id="country" />-->
91100 <input type="hidden" value="@currency_code" name="currency_code" />
92101 <input type="hidden" value="@utm_source" name="utm_source"/>
93102 <input type="hidden" value="@utm_medium" name="utm_medium"/>
——@@ -106,6 +115,8 @@
107116 <!-- new required fields -->
108117 <input type="hidden" value="@gateway" name="gateway"/>
109118 <input type="hidden" value="@payment_method" name="payment_method"/>
 119+ <!-- required fields omitted above -->
 120+ <input type="hidden" value="XX" name="state"/>
110121 </form>
111122 <div id="where-content">
112123 {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
——@@ -113,13 +124,19 @@
114125 </div>
115126 </div>
116127 <p id="informationsharing">%donate_interface-informationsharing|url%</p>
117 - <!-- TODO: links inside the message or not? -->
118 - <ul id="moreinfolinks">
119 - <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
120 - <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
121 - <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
122 - <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
123 - </ul>
 128+ <table>
 129+ <tr>
 130+ <td>
 131+ <ul id="moreinfolinks">
 132+ <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>
 133+ <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>
 134+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 135+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 136+ </ul>
 137+ </td>
 138+ <td>@verisign_logo</td>
 139+ </tr>
 140+ </table>
124141 </div>
125142 </td>
126143 </tr>

Follow-up revisions

RevisionCommit summaryAuthorDate
r102243MFT r102191, r102195, r102196, r102200, r102203, r102213, r102214, r102215, r...awjrichards03:31, 7 November 2011

Status & tagging log