r102126 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r102125‎ | r102126 | r102127 >
Date:22:43, 5 November 2011
Author:pgehres
Status:ok
Tags:
Comment:
Removing CC selectors from pfp 2steps, adding 2-2tep-CA
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_2step-CA.html (added) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_2step-US.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step-CA.html (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_2step-US.html
@@ -66,7 +66,7 @@
6767 <input class="btn" id="pp" type="button" value="%donate_interface-paypal-button%"/><span id='loading'></span>
6868 </p>
6969 </div>
70 - <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 70+ <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>
7171 <div id="step2wrapper">
7272 <div id="billing-content" class="gainlayout">
7373 <div id="billingErrorMessages" class="small"></div>
@@ -89,17 +89,17 @@
9090 <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
9191
9292
93 - <dl class="">
94 - <dt><span class="label">Select credit card</span></dt>
95 - <dd class="field" style="margin-bottom: 0;">
96 - <ul class="options-h" id="cards" style="margin: 0;">
97 - <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>
98 - <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>
99 - <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>
100 - <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>
101 - </ul>
102 - </dd>
103 - </dl>
 93+ <!--<dl class="">-->
 94+ <!--<dt><span class="label">Select credit card</span></dt>-->
 95+ <!--<dd class="field" style="margin-bottom: 0;">-->
 96+ <!--<ul class="options-h" id="cards" style="margin: 0;">-->
 97+ <!--<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>-->
 98+ <!--<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>-->
 99+ <!--<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>-->
 100+ <!--<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>-->
 101+ <!--</ul>-->
 102+ <!--</dd>-->
 103+ <!--</dl>-->
104104 </div>
105105 <!--</div>-->
106106 <!--<div id="step3header"><h3>Payment Information <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>-->
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_2step-CA.html
@@ -0,0 +1,215 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('pfp.form.rapidhtml.webitects_2step');
 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|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+
 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% <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 id="paymentErrorMessages" class="small"></div>
 75+ <div class="name-fields">
 76+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 77+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 78+ </div>
 79+ <div class="loc-fields">
 80+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 81+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 82+ <span class="loc-state">
 83+ <select id="state" name="state" class="txt" value="@state" >
 84+ <option value=""></option>
 85+ <option value=""></option><option value="AB">AB</option><option value="BC">BC</option><option value="MB">MB</option><option value="NB">NB</option><option value="NL">NL</option><option value="NS">NS</option><option value="ON">ON</option><option value="PE">PE</option><option value="QC">QC</option><option value="SK">SK</option>
 86+ </select>
 87+ </span>
 88+ <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 -->
 89+ </div>
 90+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 91+
 92+
 93+ <!--<dl class="">-->
 94+ <!--<dt><span class="label">Select credit card</span></dt>-->
 95+ <!--<dd class="field" style="margin-bottom: 0;">-->
 96+ <!--<ul class="options-h" id="cards" style="margin: 0;">-->
 97+ <!--<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>-->
 98+ <!--<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>-->
 99+ <!--<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>-->
 100+ <!--<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>-->
 101+ <!--</ul>-->
 102+ <!--</dd>-->
 103+ <!--</dl>-->
 104+ </div>
 105+ <!--</div>-->
 106+ <!--<div id="step3header"><h3>Payment Information <span class="mute" id="change-payment" style="display: none;">(<a href="#">Change</a>)</span></h3></div>-->
 107+ <!--<div id="step3wrapper" style="display: none;">-->
 108+ <div id="payment" class="gainlayout">
 109+
 110+ <dl class="form">
 111+ <dt><span class="label"><label for="card_num">Card number</label></span></dt>
 112+ <dd class="field"><input class="txt" id="card_num" name="card_num" value="@card_num"/></dd>
 113+
 114+ <dt></dt>
 115+ <dd class="field">
 116+ <div class="l" style="margin-right: 5%;">
 117+ <span class="label">Expiration date</span>
 118+ <select id="mos" name="mos">
 119+ <option value="">Month</option>
 120+ <option value="01">01 - January</option>
 121+ <option value="02">02 - February</option>
 122+ <option value="03">03 - March</option>
 123+ <option value="04">04 - April</option>
 124+ <option value="05">05 - May</option>
 125+ <option value="06">06 - June</option>
 126+ <option value="07">07 - July</option>
 127+ <option value="08">08 - August</option>
 128+ <option value="09">09 - September</option>
 129+ <option value="10">10 - October</option>
 130+ <option value="11">11 - November</option>
 131+ <option value="12">12 - December</option>
 132+ </select>
 133+
 134+ <select id="year" name="year">
 135+ <option value="">Year</option>
 136+ <option value="2011">2011</option>
 137+ <option value="2012">2012</option>
 138+ <option value="2013">2013</option>
 139+ <option value="2014">2014</option>
 140+ <option value="2015">2015</option>
 141+ <option value="2016">2016</option>
 142+ <option value="2017">2017</option>
 143+ <option value="2018">2018</option>
 144+ <option value="2019">2019</option>
 145+ <option value="2020">2020</option>
 146+ </select>
 147+ </div>
 148+ <div class="l">
 149+ <label class="label" for="cvv">Security code</label>
 150+ <input class="txt-sm" id="cvv" name="cvv" value="@cvv"/>
 151+ <a class="mute" href="#" id="where">Where?</a>
 152+ </div>
 153+
 154+ <div class="clear" id="codes" style="display: none;"><img alt="Security codes" src="@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png" /></div>
 155+ </dd>
 156+
 157+ <dt></dt>
 158+ <dd class="field">
 159+ <input id="submitcreditcard" class="btn" type="button" value="Submit donation" />
 160+ <p class="mute"><img alt="" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" /> Your credit card will be securely processed.</p>
 161+ </dd>
 162+ </dl>
 163+ </div>
 164+ </div>
 165+
 166+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 167+ <input type="hidden" name="returnto" value="Thank_You/en" />
 168+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 169+ <input type="hidden" value="@card" name="card" id="card">
 170+
 171+ <input type="hidden" value="@amount" name="amount" />
 172+ <input type="hidden" value="US" name="country" id="country" />
 173+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 174+ <input type="hidden" value="@currency_code" name="currency_code" />
 175+ <input type="hidden" value="@utm_source" name="utm_source"/>
 176+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 177+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 178+ <input type="hidden" value="@language" name="language"/>
 179+ <input type="hidden" value="@referrer" name="referrer"/>
 180+ <input type="hidden" value="@comment" name="comment"/>
 181+ <input type="hidden" value="@comment-option" name="comment-option"/>
 182+ <input type="hidden" value="1 " name="email-opt"/>
 183+ <input type="hidden" value="processed" name="payment_method"/>
 184+ <input type="hidden" value="@token" name="token"/>
 185+ <input type="hidden" value="@order_id" name="order_id"/>
 186+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 187+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 188+ <input type="hidden" value="@data_hash" name="data_hash"/>
 189+ <input type="hidden" value="@owa_session" name="owa_session"/>
 190+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 191+ <!-- new required fields -->
 192+ <input type="hidden" value="@gateway" name="gateway"/>
 193+ <input type="hidden" value="@payment_method" name="payment_method"/>
 194+ </form>
 195+ <div id="where-content">
 196+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 197+ </div>
 198+ </div>
 199+ </div>
 200+ <p id="informationsharing">%donate_interface-informationsharing%</p>
 201+ <!-- TODO: links inside the message or not? -->
 202+ <ul id="moreinfolinks">
 203+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 204+ <li>%donate_interface-otherways-short%</li><!-- TODO: localize the link -->
 205+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 206+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 207+ </ul>
 208+ </div>
 209+ </td>
 210+ </tr>
 211+ </table>
 212+</div>
 213+
 214+<!-- Wikimedia Project logo
 215+<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>
 216+ -->
Property changes on: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_2step-CA.html
___________________________________________________________________
Added: svn:eol-style
1217 + native
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/webitects_2_3step-CA.html
@@ -94,8 +94,8 @@
9595 <ul class="options-h" id="cards" style="margin: 0;">
9696 <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>
9797 <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>
98 - <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>
99 - <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>
 98+ <!--<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>-->
 99+ <!--<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>-->
100100 </ul>
101101 <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="Continue" /></div>
102102 </dd>
@@ -178,7 +178,7 @@
179179 <input type="hidden" value="@referrer" name="referrer"/>
180180 <input type="hidden" value="@comment" name="comment"/>
181181 <input type="hidden" value="@comment-option" name="comment-option"/>
182 - <input type="hidden" value="@email-opt" name="email-opt"/>
 182+ <input type="hidden" value="1" name="email-opt"/>
183183 <input type="hidden" value="processed" name="payment_method"/>
184184 <input type="hidden" value="@token" name="token"/>
185185 <input type="hidden" value="@order_id" name="order_id"/>

Follow-up revisions

RevisionCommit summaryAuthorDate
r102128MFT r102076, r102123, r102126awjrichards23:27, 5 November 2011

Status & tagging log