r102735 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r102734‎ | r102735 | r102736 >
Date:01:38, 11 November 2011
Author:awjrichards
Status:deferred
Tags:
Comment:
MFT r102733
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
——@@ -0,0 +1,165 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects.1st');
 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+ var ajaxError = "%donate_interface-error-msg-general%";
 11+</script>
 12+<!--[if lt IE 7]>
 13+<script type="text/javascript">
 14+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
 15+</script>
 16+<style type="text/css">
 17+ body{
 18+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 19+ }
 20+</style><![endif]-->
 21+<!--[if IE 7]>
 22+<style>
 23+ .gainlayout {
 24+ zoom: 1;
 25+ height: 1%;
 26+ }
 27+</style>
 28+<![endif]-->
 29+
 30+<div class="ltr">
 31+ <table id="layouttable">
 32+ <tr>
 33+ <td>
 34+ <div id="appeal">
 35+ <div id="appeal-content">
 36+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal/title|@language}}</span></h2>
 37+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal/text|@language}}</div>
 38+ </div>
 39+ </div>
 40+ </td>
 41+ <td>
 42+ <div id="donate">
 43+ <div id="donate-content">
 44+ <div id="donate-body" style="padding: 0 1em;">
 45+ <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>
 46+
 47+ <form method="post" name="paypalcontribution">
 48+ <div id="step1wrapper">
 49+ <div id="amtErrorMessages" class="small"></div>
 50+ <table id="amount-table-white">
 51+ <tr>
 52+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="5" /> <span id="amountSpan0">$5</span></label></td>
 53+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="10" /> <span id="amountSpan1">$10</span></label></td>
 54+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="20" /> <span id="amountSpan2">$20</span></label></td>
 55+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="50" /> <span id="amountSpan3">$50</span></label></td>
 56+ </tr>
 57+ <tr>
 58+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="75" /> <span id="amountSpan4">$75</span></label></td>
 59+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="100" /> <span id="amountSpan5">$100</span></label></td>
 60+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="250" /> <span id="amountSpan6">$250</span></label></td>
 61+ <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>
 62+ </tr>
 63+ </table>
 64+
 65+ <p class="donate-options">
 66+ <input class="btn" id="cc" type="button" value="%donate_interface-cc-button%" /><br />
 67+ <input class="btn" id="pp" type="button" value="%donate_interface-paypal-button%"/><span id='loading'></span>
 68+ </p>
 69+ </div>
 70+ <div id="step2header"><h3>%donate_interface-cc-form-header-personal% <img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 71+ <div id="step2wrapper">
 72+ <div id="billing-content" class="gainlayout">
 73+ <div id="billingErrorMessages" class="small"></div>
 74+ <div class="name-fields">
 75+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 76+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 77+ </div>
 78+ <div class="loc-fields">
 79+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 80+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 81+ <span class="loc-state">
 82+ <select id="state" name="state" class="txt" value="@state" >
 83+ <option value=""></option>
 84+ <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>
 85+ </select>
 86+ </span>
 87+ <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 -->
 88+ </div>
 89+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 90+
 91+ <dl class="">
 92+ <dt><span id="select-credit-card" class="label">%donate_interface-select-credit-card%</span></dt>
 93+ <dd class="field" style="margin-bottom: 0;">
 94+ <ul class="options-h" id="cards" style="margin: 0;">
 95+ <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>
 96+ <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>
 97+ <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>
 98+ <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>
 99+ </ul>
 100+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 101+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit / debit card will be securely processed.</p>
 102+ </dd>
 103+ </dl>
 104+ </div>
 105+ </div>
 106+ <div id="step3header"><h3>%donate_interface-cc-form-header-payment% <span class="mute" id="change-payment" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 107+ <div id="step3wrapper" style="display: none;">
 108+ <div id="payment" class="gainlayout" style="height:314px;text-align:center;"></div>
 109+ </div>
 110+
 111+ <input type="hidden" name="returnto" value="Thank_You/en" />
 112+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 113+
 114+ <input type="hidden" value="@amount" name="amount" />
 115+ <input type="hidden" value="US" name="country" id="country" />
 116+ <input type="hidden" value="USD" name="currency_code" />
 117+ <input type="hidden" value="@utm_source" name="utm_source"/>
 118+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 119+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 120+ <input type="hidden" value="@language" name="language"/>
 121+ <input type="hidden" value="@referrer" name="referrer"/>
 122+ <input type="hidden" value="@comment" name="comment"/>
 123+ <input type="hidden" value="@comment-option" name="comment-option"/>
 124+ <input type="hidden" value="@email-opt" name="email-opt"/>
 125+ <input type="hidden" value="@token" name="token"/>
 126+ <input type="hidden" value="@order_id" name="order_id"/>
 127+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 128+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 129+ <input type="hidden" value="@data_hash" name="data_hash"/>
 130+ <input type="hidden" value="@owa_session" name="owa_session"/>
 131+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 132+ <!-- new required fields -->
 133+ <input type="hidden" value="@gateway" name="gateway"/>
 134+ <input type="hidden" value="@payment_method" name="payment_method"/>
 135+ </form>
 136+ <div id="where-content">
 137+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 138+ </div>
 139+ </div>
 140+ </div>
 141+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 142+ <table>
 143+ <tr>
 144+ <td>
 145+ <ul id="moreinfolinks">
 146+ <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>
 147+ <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>
 148+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 149+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 150+ </ul>
 151+ </td>
 152+ <td>@verisign_logo</td>
 153+ </tr>
 154+ </table>
 155+ </div>
 156+ </td>
 157+ </tr>
 158+ </table>
 159+
 160+
 161+
 162+</div>
 163+
 164+<!-- Wikimedia Project logo
 165+<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>
 166+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
___________________________________________________________________
Added: svn:eol-style
1167 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js
——@@ -101,7 +101,7 @@
102102 }
103103 // Display selected amount
104104 window.showAmount = function( e ) {
105 - $( "#selected-amount" ).html( "($" + e.val() + ")" );
 105+ $( "#selected-amount" ).html( "$" + e.val() + "" );
106106 $( "#change-amount" ).show();
107107 }
108108 window.validateAmount = function() {
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
109109 Merged /trunk/extensions/DonationInterface:r102733

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r102733Adding B-US form for GC testing in the US vs PFP-Bpgehres01:31, 11 November 2011

Status & tagging log