r103500 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103499‎ | r103500 | r103501 >
Date:20:13, 17 November 2011
Author:pgehres
Status:ok
Tags:
Comment:
Adding BPAY form for AU
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/obt (added) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/obt/obt-bpay.html (added) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css
@@ -86,16 +86,31 @@
8787 .loc-fields.nostate .loc-city { float: left; margin: 0 1% 5px 0; width: 48%; }
8888 .loc-fields.nostate .loc-postal { float: left; margin: 0 1% 5px 0; width: 49%; }
8989
 90+/* Location where we are not including a state select */
 91+.loc-fields.bigstate .loc-city { margin-right: 1%; width: 42%; }
 92+.loc-fields.bigstate .loc-postal { width: 24%; }
 93+.loc-fields.bigstate .loc-state { margin-right: 0%; width: 30%; }
 94+
 95+.loc-postal.ja { width: 300px; }
 96+
 97+/* Direct debit fields */
 98+
 99+.dd-acctnumber { float: left; margin: 5px 2% 5px 0; width: 48%; }
 100+.dd-acctname { float: left; margin: 5px 2% 5px 0; width: 48%; }
 101+.dd-bankcode { margin-bottom: 5px; width: 100%; }
 102+
 103+
90104 /* Name */
91105 .name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; }
92106 .name-fields .name-last { margin: 0; }
93107
 108+/* Name - reversed */
 109+.name-fields.reversed span { float: left; margin: 0 2% 5px 0; width: 48%; }
 110+.name-fields.reserved .name-first{ margin: 0; }
 111+
94112 /* Help text */
95113 .field-help { color: #666; font-size: 0.8em; font-weight: normal; }
96114
97 -/* Hints */
98 -.ezpz-hint { color: #777; font-style: italic; }
99 -
100115 /* Options */
101116 .form .options-h, .form .options-v { margin: 0; }
102117 .options-h, .options-v { list-style: none; margin: 0 0 1em 0; }
@@ -222,3 +237,8 @@
223238 list-style: none !important;
224239 list-style-image: none !important;
225240 }
 241+
 242+#bpay{
 243+ margin: 25px 0 0 15px;
 244+ font-size: 12px;
 245+}
\ No newline at end of file
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/obt/obt-bpay.html
@@ -0,0 +1,143 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects.bt');
 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">@amount @currency_code</span></h3></div>
 46+ <div id="amtErrorMessages" class="small"></div>
 47+ <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>
 48+ <div id="step2wrapper">
 49+ <div id="billing-content" class="gainlayout">
 50+ <div id="billingErrorMessages" class="small"></div>
 51+ <div id="paymentErrorMessages" class="small"></div>
 52+ <div class="name-fields">
 53+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 54+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 55+ </div>
 56+ <div class="loc-fields">
 57+ <!-- TODO: add locality to translation -->
 58+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 59+ <span class="loc-city"><input class="txt" id="city" name="city" title="Locality" value="@city" placeholder="Locality"/></span>
 60+ <span class="loc-state">
 61+ <select id="state" name="state" class="txt" value="@state" >
 62+ <option value="">%donate_interface-donor-state%</option>
 63+ <option value="ACT">ACT</option>
 64+ <option value="JBT">JBT</option>
 65+ <option value="NSW">NSW</option>
 66+ <option value="NT">NT</option>
 67+ <option value="QLD">QLD</option>
 68+ <option value="SA">SA</option>
 69+ <option value="TAS">TAS</option>
 70+ <option value="VIC">VIC</option>
 71+ <option value="WA">WA</option>
 72+ </select>
 73+ </span>
 74+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>
 75+ </div>
 76+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 77+ <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
 78+ <div id="bpay">
 79+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/BPAY_Landscape_MONO.gif" alt="BPAY" width="100" >
 80+ <p>&reg; Registered to BPAY Pty Ltd ABN 69 079 137 518</p>
 81+ </div>
 82+ </div>
 83+ </div>
 84+
 85+
 86+
 87+ <input type="hidden" name="returnto" value="Thank_You/en" />
 88+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 89+
 90+ <input type="hidden" value="@amount" name="amount" />
 91+ <input type="hidden" value="AU" name="country" id="country" />
 92+ <input type="hidden" value="AUD" name="currency_code" />
 93+ <input type="hidden" value="@utm_source" name="utm_source"/>
 94+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 95+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 96+ <input type="hidden" value="@language" name="language"/>
 97+ <input type="hidden" value="@referrer" name="referrer"/>
 98+ <input type="hidden" value="@comment" name="comment"/>
 99+ <input type="hidden" value="@comment-option" name="comment-option"/>
 100+ <input type="hidden" value="1" name="email-opt"/>
 101+ <input type="hidden" value="@token" name="token"/>
 102+ <input type="hidden" value="@order_id" name="order_id"/>
 103+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 104+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 105+ <input type="hidden" value="@data_hash" name="data_hash"/>
 106+ <input type="hidden" value="@owa_session" name="owa_session"/>
 107+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 108+ <!-- new required fields -->
 109+ <input type="hidden" value="@gateway" name="gateway"/>
 110+ <!-- required fields for bt and dd -->
 111+ <input type="hidden" value="obt" name="payment_method"/>
 112+ <input type="hidden" value="bpay" name="payment_submethod"/>
 113+ </form>
 114+ <div id="where-content">
 115+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 116+ </div>
 117+ </div>
 118+ </div>
 119+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 120+ <table>
 121+ <tr>
 122+ <td>
 123+ <ul id="moreinfolinks">
 124+ <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>
 125+ <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>
 126+ <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li>
 127+ <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>
 128+ </ul>
 129+ </td>
 130+ <td>@verisign_logo</td>
 131+ </tr>
 132+ </table>
 133+ </div>
 134+ </td>
 135+ </tr>
 136+ </table>
 137+
 138+
 139+
 140+</div>
 141+
 142+<!-- Wikimedia Project logo
 143+<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>
 144+ -->
Property changes on: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/obt/obt-bpay.html
___________________________________________________________________
Added: svn:eol-style
1145 + 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