r103515 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103514‎ | r103515 | r103516 >
Date:22:16, 17 November 2011
Author:pgehres
Status:ok
Tags:
Comment:
Adding JCB to AU as well as JCB card logo
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/includes/card-jcb.png (added) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd-AU.html (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/includes/card-jcb.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes on: trunk/extensions/DonationInterface/gateway_forms/includes/card-jcb.png
___________________________________________________________________
Added: svn:mime-type
11 + image/png
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd-AU.html
@@ -0,0 +1,166 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.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('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+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">(AUD)</span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 46+ <div id="step1wrapper" style="display: none;">
 47+ <div id="amtErrorMessages" class="small"></div>
 48+ <table id="amount-table-white">
 49+ <tr>
 50+ <td><label><input id="amountRadio0" type="radio" name="amountRadio" value="10" /> <span id="amountSpan0">10</span></label></td>
 51+ <td><label><input id="amountRadio1" type="radio" name="amountRadio" value="20" /> <span id="amountSpan1">20</span></label></td>
 52+ <td><label><input id="amountRadio2" type="radio" name="amountRadio" value="25" /> <span id="amountSpan2">25</span></label></td>
 53+ <td><label><input id="amountRadio3" type="radio" name="amountRadio" value="35" /> <span id="amountSpan3">35</span></label></td>
 54+ </tr>
 55+ <tr>
 56+ <td><label><input id="amountRadio4" type="radio" name="amountRadio" value="50" /> <span id="amountSpan4">50</span></label></td>
 57+ <td><label><input id="amountRadio5" type="radio" name="amountRadio" value="75" /> <span id="amountSpan5">75</span></label></td>
 58+ <td><label><input id="amountRadio6" type="radio" name="amountRadio" value="100" /> <span id="amountSpan6">100</span></label></td>
 59+ <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>
 60+ </tr>
 61+ </table>
 62+ </div>
 63+ <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>
 64+ <div id="step2wrapper">
 65+ <div id="billing-content" class="gainlayout">
 66+ <div id="billingErrorMessages" class="small"></div>
 67+ <div class="name-fields">
 68+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 69+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 70+ </div>
 71+ <div class="loc-fields">
 72+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 73+ <span class="loc-city"><input class="txt" id="city" name="city" title="Locality" value="@city" placeholder="Locality"/></span>
 74+ <span class="loc-state">
 75+ <select id="state" name="state" class="txt" value="@state" >
 76+ <option value="">%donate_interface-donor-state%</option>
 77+ <option value="ACT">ACT</option>
 78+ <option value="JBT">JBT</option>
 79+ <option value="NSW">NSW</option>
 80+ <option value="NT">NT</option>
 81+ <option value="QLD">QLD</option>
 82+ <option value="SA">SA</option>
 83+ <option value="TAS">TAS</option>
 84+ <option value="VIC">VIC</option>
 85+ <option value="WA">WA</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-donor-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+ <dl class="">
 93+ <dt><span id="select-credit-card" class="label">%donate_interface-select-credit-card%</span></dt>
 94+ <dd class="field" style="margin-bottom: 0;">
 95+ <ul class="options-h" id="cards" style="margin: 0;">
 96+ <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>
 97+ <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" 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>-->
 100+ <li><input id="cc-jcb" name="cardtype" type="radio" value="jcb" class="cardradio" /> <label for="cc-jcb"><img alt="JCB" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li>
 101+ </ul>
 102+ <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div>
 103+ </dd>
 104+ </dl>
 105+ </div>
 106+ </div>
 107+ <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>
 108+ <div id="step3wrapper" style="display: none;">
 109+ <div id="payment" class="gainlayout" style="height:314px;text-align:center;"></div>
 110+ </div>
 111+
 112+ <input type="hidden" name="returnto" value="Thank_You/en" />
 113+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 114+
 115+ <input type="hidden" value="@amount" name="amount" />
 116+ <input type="hidden" value="AU" name="country" id="country" />
 117+ <input type="hidden" value="AUD" name="currency_code" />
 118+ <input type="hidden" value="@utm_source" name="utm_source"/>
 119+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 120+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 121+ <input type="hidden" value="@language" name="language"/>
 122+ <input type="hidden" value="@referrer" name="referrer"/>
 123+ <input type="hidden" value="@comment" name="comment"/>
 124+ <input type="hidden" value="@comment-option" name="comment-option"/>
 125+ <input type="hidden" value="1" name="email-opt"/>
 126+ <input type="hidden" value="@token" name="token"/>
 127+ <input type="hidden" value="@order_id" name="order_id"/>
 128+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 129+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 130+ <input type="hidden" value="@data_hash" name="data_hash"/>
 131+ <input type="hidden" value="@owa_session" name="owa_session"/>
 132+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 133+ <!-- new required fields -->
 134+ <input type="hidden" value="@gateway" name="gateway"/>
 135+ <input type="hidden" value="@payment_method" name="payment_method"/>
 136+ </form>
 137+ <div id="where-content">
 138+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 139+ </div>
 140+ </div>
 141+ </div>
 142+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 143+ <table>
 144+ <tr>
 145+ <td>
 146+ <ul id="moreinfolinks">
 147+ <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>
 148+ <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>
 149+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 150+ <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>
 151+ </ul>
 152+ </td>
 153+ <td>@verisign_logo</td>
 154+ </tr>
 155+ </table>
 156+ </div>
 157+ </td>
 158+ </tr>
 159+ </table>
 160+
 161+
 162+
 163+</div>
 164+
 165+<!-- Wikimedia Project logo
 166+<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>
 167+ -->
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects2nd-AU.html
___________________________________________________________________
Added: svn:eol-style
1168 + native

Follow-up revisions

RevisionCommit summaryAuthorDate
r103841MFT r102185, r103070, r103105, r103281, r103500, r103515, r103636khorn21:57, 21 November 2011
r103847MFT r102338, r102681, r102685, r102810, r102828, r102829, r102832, r102836, r...khorn22:30, 21 November 2011
r103848MFT r102338, r102681, r102685, r102810, r102828, r102829, r102832, r102836, r...khorn22:31, 21 November 2011

Status & tagging log